diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 16:29:21 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-06-07 16:29:21 -0700 |
commit | e8193ce572f0ddb8004acf976bba119f0abbe6ca (patch) | |
tree | 9bfabb44e3a00bf757f8e6859ff6277487ecefd1 /drivers/acpi | |
parent | 5125ed5b5438ab534df9bfc309dd556781c4ec9b (diff) | |
parent | c9a2433a901250637e05539ef111b91dbc52edb8 (diff) |
Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband
Pull infiniband fixes from Roland Dreier:
- qib RCU/lockdep fix
- iser device removal fix, plus doc fixes
* tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland/infiniband:
IB/qib: Fix lockdep splat in qib_alloc_lkey()
MAINTAINERS: Add entry for iSCSI Extensions for RDMA (iSER) initiator
IB/iser: Add Mellanox copyright
IB/iser: Fix device removal flow
Diffstat (limited to 'drivers/acpi')
0 files changed, 0 insertions, 0 deletions