Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:33:54 +0000 (12:33 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 27 Sep 2010 19:33:54 +0000 (12:33 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
  RDMA/cxgb3: Turn off RX coalescing for iWARP connections


Trivial merge