Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2011 21:18:55 +0000 (14:18 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 18 Aug 2011 21:18:55 +0000 (14:18 -0700)
commitfbad8991ef9d41d1fad587dff23fa6deff01af83
tree2acb80e4c1dafafa3349bff827e6d2f07690c02a
parentf6a975c50a1c5e68c376634b4331052990ca3dfd
parent80b43de83781ed67810d54c7892ac9cb2a2601df
Merge branch 'for-linus' of git://git./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()