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
..
ipoib_cm.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
ipoib_ethtool.c	net: infiniband/ulp/ipoib: convert to hw_features	2011-04-20 01:30:42 -07:00
ipoib_fs.c	Merge branch 'modsplit-Oct31_2011' of git://git.kernel.org/pub/scm/linux/kernel/git/paulg/linux	2011-11-06 19:44:47 -08:00
ipoib_ib.c	IPoIB: fix skb truesize underestimatiom	2012-07-10 23:33:12 -07:00
ipoib_main.c	ipoib: Convert over to dev_lookup_neigh_skb().	2012-07-05 01:09:36 -07:00
ipoib_multicast.c	ipoib: Need to do dst_neigh_lookup_skb() outside of priv->lock.	2012-07-05 21:08:05 -07:00
ipoib_verbs.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ipoib_vlan.c	include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h	2010-03-30 22:02:32 +09:00
ipoib.h	IPoIB: Stop lying about hard_header_len and use skb->cb to stash LL addresses	2012-02-08 18:26:54 -05:00
Kconfig	kconfig: rename CONFIG_EMBEDDED to CONFIG_EXPERT	2011-01-20 17:02:05 -08:00
Makefile	IPoIB: Add basic ethtool support	2008-04-16 21:09:32 -07:00