leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
871039f02f
linux/drivers/net/sfc
History
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
..
bitfield.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
efx.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
efx.h sfc: Remove declarations of nonexistent functions 2010-02-03 19:12:46 -08:00
enum.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
ethtool.c sfc: Fix some incorrect or redundant comments 2010-02-03 19:12:47 -08:00
falcon_boards.c sfc: SFE4002/SFN4112F: Widen temperature and voltage tolerances 2010-02-19 15:50:35 -08:00
falcon_gmac.c sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
falcon_xmac.c sfc: Include XGXS in XMAC link status check except in XGMII loopback 2009-12-23 19:09:05 -08:00
falcon.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
io.h sfc: Rename register I/O header and functions used by both Falcon and Siena 2009-10-24 04:27:04 -07:00
Kconfig sfc: Add support for SFC9000 family (2) 2009-11-29 17:23:57 -08:00
mac.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
Makefile sfc: Add support for SFC9000 family (2) 2009-11-29 17:23:57 -08:00
mcdi_mac.c sfc: Add support for SFC9000 family (1) 2009-11-29 17:23:56 -08:00
mcdi_pcol.h sfc: Update MCDI protocol definitions 2010-02-03 19:12:43 -08:00
mcdi_phy.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
mcdi.c Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 2010-02-25 23:22:42 -08:00
mcdi.h sfc: Implement NVRAM selftest for SFC9000 family 2010-02-03 19:12:45 -08:00
mdio_10g.c sfc: Replace PHY MDIO test with an 'alive' test 2010-02-03 19:12:44 -08:00
mdio_10g.h sfc: Replace PHY MDIO test with an 'alive' test 2010-02-03 19:12:44 -08:00
mtd.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
net_driver.h sfc: Do not include unneeded headers 2010-02-03 19:12:47 -08:00
nic.c sfc: Fix some incorrect or redundant comments 2010-02-03 19:12:47 -08:00
nic.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
phy.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00
qt202x_phy.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
regs.h tree-wide: Assorted spelling fixes 2010-02-09 11:13:56 +01:00
rx.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
selftest.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
selftest.h sfc: Replace PHY MDIO test with an 'alive' test 2010-02-03 19:12:44 -08:00
siena.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
spi.h sfc: Extend MTD driver for use with new NICs 2009-11-29 17:23:54 -08:00
tenxpress.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
tx.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
workarounds.h sfc: Update version, copyright dates, authors 2009-11-29 17:23:58 -08:00