Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2011 23:13:53 +0000 (15:13 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 19 Dec 2011 23:13:53 +0000 (15:13 -0800)
commit511585a28e5b5fd1cac61e601e42efc4c5dd64b5
treed3205b45d9666a621359098e6d9a5723b4c2660a
parent64edb05e3c7497c21496a2bafbdbac453f2a9155
parent480390c8f393b3c770b7b71faa094c733bd0ae09
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: Correct sense on freectxts increment and decrement
  RDMA/cma: Verify private data length
  IB/mlx4: Fix shutdown crash accessing a non-existent bitmap