From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 4 Nov 2011 19:14:11 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=16dfd1faed8c5235d9a7c190b91b6d97d6cd3272;p=linux-beck.git

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
---

16dfd1faed8c5235d9a7c190b91b6d97d6cd3272