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)
commitd6f74be08d4388222ac83eeba0ade72659e7d247
tree610e1a3a063d16673e57620e862e9d9905987c97
parent6e029fe3737b022610ededf9e70ee84fb2bdc045
parentbec658ff31453a5726b1c188674d587a5d40c482
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:
  RDMA/cxgb3: Turn off RX coalescing for iWARP connections