David S. Miller 6a06e5e1bb Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ... Conflicts: drivers/net/team/team.c drivers/net/usb/qmi_wwan.c net/batman-adv/bat_iv_ogm.c net/ipv4/fib_frontend.c net/ipv4/route.c net/l2tp/l2tp_netlink.c The team, fib_frontend, route, and l2tp_netlink conflicts were simply overlapping changes. qmi_wwan and bat_iv_ogm were of the "use HEAD" variety. With help from Antonio Quartulli. Signed-off-by: David S. Miller <davem@davemloft.net>		2012-09-28 14:40:49 -04:00
..
amso1100	IB: Fix typos in infiniband drivers	2012-08-15 11:56:19 -07:00
cxgb3	IB: Fix typos in infiniband drivers	2012-08-15 11:56:19 -07:00
cxgb4	Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net	2012-09-28 14:40:49 -04:00
ehca	Remove all #inclusions of asm/system.h	2012-03-28 18:30:03 +01:00
ipath	IB/ipath: Replace open-coded ARRAY_SIZE with macro	2012-05-08 11:17:20 -07:00
mlx4	IB/mlx4: Check iboe netdev pointer before dereferencing it	2012-08-16 09:38:19 -07:00
mthca	IB/mthca: Fill in sq_sig_type in query QP	2012-07-11 09:22:57 -07:00
nes	RDMA/nes: Don't call event handler if pointer is NULL	2012-05-14 12:48:07 -07:00
ocrdma	RDMA/ocrdma: Fix CQE expansion of unsignaled WQE	2012-09-14 10:40:58 -07:00
qib	IB/qib: Fix failure of compliance test C14-024#06_LocalPortNum	2012-09-14 10:42:32 -07:00