From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 27 Sep 2010 19:33:54 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Tag: v2.6.36-rc6~10
X-Git-Url: http://bbs.cooldavid.org/git/?p=net-next-2.6.git;a=commitdiff_plain;h=d6f74be08d4388222ac83eeba0ade72659e7d247

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:
  RDMA/cxgb3: Turn off RX coalescing for iWARP connections
---

d6f74be08d4388222ac83eeba0ade72659e7d247