20b782daebf887dcb95e9 author Linus Torvalds 1157084849 -0700 committer Linus Torvalds 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 ÏÖ£ œ,x