aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/fpga/fpga-mgr.c
diff options
context:
space:
mode:
authorLinus Torvalds <[email protected]>2015-10-02 18:51:46 +0000
committerLinus Torvalds <[email protected]>2015-10-02 18:51:46 +0000
commitb55a97e759c9e9efdce0470f520026383c514a13 (patch)
tree502a67e8598807803164358cc684f7590ede73db /drivers/fpga/fpga-mgr.c
parentMerge tag 'dmaengine-fix-4.3-rc4' of git://git.infradead.org/users/vkoul/slav... (diff)
parentm68k/defconfig: Update defconfigs for v4.3-rc1 (diff)
downloadkernel-b55a97e759c9e9efdce0470f520026383c514a13.tar.gz
kernel-b55a97e759c9e9efdce0470f520026383c514a13.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: "Summary: - Fix for accidental modification of arguments of syscall functions - Wire up new syscalls - Update defconfigs" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/defconfig: Update defconfigs for v4.3-rc1 m68k: Define asmlinkage_protect m68k: Wire up membarrier m68k: Wire up userfaultfd m68k: Wire up direct socket calls
Diffstat (limited to 'drivers/fpga/fpga-mgr.c')
0 files changed, 0 insertions, 0 deletions