Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
commit16dfd1faed8c5235d9a7c190b91b6d97d6cd3272
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 19:14:11 +0000 (4 12:14 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 4 Nov 2011 19:14:11 +0000 (4 12:14 -0700)
tree4de59077fa4a31cac13e7ba8528e347c0ca1dc2f
parentb31966816dcd3d8b16109f39d7c7501dc9abb010
parentb8108d6886946cb50434bdbb0214ed81885da8b8
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/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