Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 19:14:11 +0000 (12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 19:14:11 +0000 (12:14 -0700)
commit75d113f979490e4ab24069dd227c732b5d2c6f5e
tree4de59077fa4a31cac13e7ba8528e347c0ca1dc2f
parent8f99e47b82edc33526be32a8d21dbd316d71e5e7
parenta0f9274c794cf1bbea3302abc1f3e55608485cfd
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/qib: Fix panic in RC error flushing logic
  IB/iser: DMA unmap TX bufs used for iSCSI/iSER headers
  IB/iser: Use separate buffers for the login request/response
  IB/mthca: Fix buddy->num_free allocation size