David S. Miller 871039f02f Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: drivers/net/stmmac/stmmac_main.c drivers/net/wireless/wl12xx/wl1271_cmd.c drivers/net/wireless/wl12xx/wl1271_main.c drivers/net/wireless/wl12xx/wl1271_spi.c net/core/ethtool.c net/mac80211/scan.c		2010-04-11 14:53:53 -07:00
..
am79c961a.c	net: convert multicast list to list_head	2010-04-03 14:22:15 -07:00
am79c961a.h
at91_ether.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
at91_ether.h
ep93xx_eth.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
ether1.c	net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions	2009-07-05 19:16:04 -07:00
ether1.h
ether3.c	net: use netdev_mc_count and netdev_mc_empty when appropriate	2010-02-12 11:38:58 -08:00
ether3.h
etherh.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
ixp4xx_eth.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
Kconfig	ARM: 5865/1: nuc900 ethernet driver needs mii	2010-01-05 20:53:07 +00:00
ks8695net.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00
ks8695net.h	net: Add support for the KS8695 ethernet devices.	2008-12-11 21:00:29 -08:00
Makefile	Add mac driver for w90p910	2009-07-20 07:45:05 -07:00
w90p910_ether.c	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2010-04-11 14:53:53 -07:00