tree d3205b45d9666a621359098e6d9a5723b4c2660a
parent 64edb05e3c7497c21496a2bafbdbac453f2a9155
parent 480390c8f393b3c770b7b71faa094c733bd0ae09
author Linus Torvalds <torvalds@linux-foundation.org> 1324336433 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1324336433 -0800

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: Correct sense on freectxts increment and decrement
  RDMA/cma: Verify private data length
  IB/mlx4: Fix shutdown crash accessing a non-existent bitmap