From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 7 Jun 2013 23:29:21 +0000 (-0700)
Subject: Merge tag 'rdma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/roland... 
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=e8193ce572f0ddb8004acf976bba119f0abbe6ca;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'rdma-for-linus' of git://git./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
---

e8193ce572f0ddb8004acf976bba119f0abbe6ca