summaryrefslogtreecommitdiff
path: root/net/sunrpc/svc_xprt.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 10:46:27 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-01-06 10:46:27 -0800
commitb1c0ec8966fa79891b796f58bf2bda1026ca5566 (patch)
tree0aa295389a570f2181438e67d4cb007c168f4214 /net/sunrpc/svc_xprt.c
parent642a74e7a411967ceea87d6ee720a436608696a0 (diff)
parentc92b29ec4a7a197199b8b937b909d80dc79d8e5b (diff)
downloadlinux-3.10-b1c0ec8966fa79891b796f58bf2bda1026ca5566.tar.gz
linux-3.10-b1c0ec8966fa79891b796f58bf2bda1026ca5566.tar.bz2
linux-3.10-b1c0ec8966fa79891b796f58bf2bda1026ca5566.zip
Merge branch 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
* 'davinci-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci: DaVinci: DM365: Add the device_enable for the DaVinci Keyscan davinci: enable ARCH_HAS_HOLES_MEMORYMODEL for DaVinci davinci: da8xx/omap-l1: mark RTC as a wakeup source davinci: cp_intc: provide set_wake function Davinci VPFE Capture: Take i2c adapter id through platform data
Diffstat (limited to 'net/sunrpc/svc_xprt.c')
0 files changed, 0 insertions, 0 deletions