tree 6f035e3502324a68427b548116d221129a66cf2c
parent 0668b47205e42c04e9c1b594573be5a822ac7f09
parent 5a4e6dccbc0cd1b726820b782daebf887dcb95e9
author Linus Torvalds <torvalds@g5.osdl.org> 1157084849 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1157084849 -0700

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/mthca: Use IRQ safe locks to protect allocation bitmaps