OpenCloudOS-Kernel/drivers/infiniband/hw
David S. Miller d978a6361a Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/nfc/microread/mei.c
	net/netfilter/nfnetlink_queue_core.c

Pull in 'net' to get Eric Biederman's AF_UNIX fix, upon which
some cleanups are going to go on-top.

Signed-off-by: David S. Miller <davem@davemloft.net>
2013-04-07 18:37:01 -04:00
..
amso1100 IB/amso1100: convert to idr_alloc() 2013-02-27 19:10:16 -08:00
cxgb3 IB/cxgb3: convert to idr_alloc() 2013-02-27 19:10:16 -08:00
cxgb4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2013-03-27 13:52:49 -04:00
ehca IB/ehca: convert to idr_alloc() 2013-02-27 19:10:16 -08:00
ipath IB/ipath: Silence a static checker warning 2013-03-22 18:07:04 -07:00
mlx4 mlx4: remove leftover idr_pre_get() call 2013-03-13 15:21:46 -07:00
mthca Drivers: infinband: remove __dev* attributes. 2013-01-03 15:57:15 -08:00
nes Main batch of InfiniBand/RDMA changes for 3.9: 2013-02-26 11:41:08 -08:00
ocrdma IB/ocrdma: convert to idr_alloc() 2013-02-27 19:10:17 -08:00
qib firmware,IB/qib: revert firmware file move 2013-04-05 12:19:39 -07:00