summaryrefslogtreecommitdiffstats
path: root/fs/fscache
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-08-18 23:18:55 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-08-18 23:18:55 +0200
commitfbad8991ef9d41d1fad587dff23fa6deff01af83 (patch)
tree2acb80e4c1dafafa3349bff827e6d2f07690c02a /fs/fscache
parentMerge git://git.kernel.org/pub/scm/linux/kernel/git/hirofumi/fatfs-2.6 (diff)
parentMerge branches 'ipoib' and 'iser' into for-next (diff)
downloadlinux-fbad8991ef9d41d1fad587dff23fa6deff01af83.tar.xz
linux-fbad8991ef9d41d1fad587dff23fa6deff01af83.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband: IB/iser: Support iSCSI PDU padding IBiser: Fix wrong mask when sizeof (dma_addr_t) > sizeof (unsigned long) IPoIB: Fix possible NULL dereference in ipoib_start_xmit()
Diffstat (limited to 'fs/fscache')
0 files changed, 0 insertions, 0 deletions