linux/drivers/infiniband/hw
David S. Miller 95f873f2ff Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	arch/arm/boot/dts/imx6sx-sdb.dts
	net/sched/cls_bpf.c

Two simple sets of overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-27 16:59:56 -08:00
..
amso1100
cxgb3
cxgb4 iw_cxgb4: Cleanup register defines/MACROS defined in t4fw_ri_api.h 2015-01-16 01:07:02 -05:00
ehca
ipath
mlx4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2015-01-27 16:59:56 -08:00
mlx5
mthca
nes
ocrdma
qib
usnic
Makefile