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
..
core.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
core.h	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
debug.c	ibm_newemac: Parameterize EMAC Multicast Match Handling	2008-07-09 16:30:46 +10:00
debug.h	ibm_newemac: Update file headers copyright notices	2007-12-07 15:09:06 -05:00
emac.h	ibm_newemac: Fix EMACx_TRTR[TRT] bit shifts	2009-11-18 05:11:09 -08:00
Kconfig	Merge commit 'origin'	2008-10-15 11:31:54 +11:00
Makefile
mal.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
mal.h	net: Add init_dummy_netdev() and fix EMAC driver using it	2009-01-14 21:05:05 -08:00
phy.c	net: variables reach -1, but 0 tested	2009-02-02 21:39:02 -08:00
phy.h	ibm_newemac: Add support for GPCS, SGMII and M88E1112 PHY	2008-10-02 13:06:42 -04:00
rgmii.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
rgmii.h	ibm_newemac: Update file headers copyright notices	2007-12-07 15:09:06 -05:00
tah.c	ibm_newemac: Fix section mismatch warnings	2008-04-25 02:08:06 -04:00
tah.h	ibm_newemac: Update file headers copyright notices	2007-12-07 15:09:06 -05:00
zmii.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
zmii.h	ibm_newemac: Update file headers copyright notices	2007-12-07 15:09:06 -05:00