linux/drivers/infiniband
David S. Miller 04c9f416e3 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	net/batman-adv/bridge_loop_avoidance.c
	net/batman-adv/bridge_loop_avoidance.h
	net/batman-adv/soft-interface.c
	net/mac80211/mlme.c

With merge help from Antonio Quartulli (batman-adv) and
Stephen Rothwell (drivers/net/usb/qmi_wwan.c).

The net/mac80211/mlme.c conflict seemed easy enough, accounting for a
conversion to some new tracing macros.

Signed-off-by: David S. Miller <davem@davemloft.net>
2012-07-10 23:56:33 -07:00
..
core netlink: add netlink_kernel_cfg parameter to netlink_kernel_create 2012-06-29 16:46:02 -07:00
hw {NET, IB}/mlx4: Add device managed flow steering firmware API 2012-07-07 16:23:05 -07:00
ulp Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2012-07-10 23:56:33 -07:00
Kconfig RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMA adapter 2012-05-08 11:17:47 -07:00
Makefile RDMA/ocrdma: Add driver for Emulex OneConnect IBoE RDMA adapter 2012-05-08 11:17:47 -07:00