David S. Miller 1c01a80cfe Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ...

Conflicts:
	drivers/net/smsc911x.c

2011-04-11 13:44:25 -07:00

..

common.h

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

descs.h

stmmac: rename the gmac as dwmac1000 and split core and dma parts

2010-01-07 17:06:10 -08:00

dwmac100_core.c

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

dwmac100_dma.c

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

dwmac100.h

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

dwmac1000_core.c

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

dwmac1000_dma.c

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

dwmac1000.h

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

dwmac_dma.h

stmmac: make ioaddr 'void __iomem *' rather than unsigned long

2010-08-25 16:30:51 -07:00

dwmac_lib.c

stmmac: fixed dma lib build when turn-on the debug option

2011-04-11 12:55:47 -07:00

enh_desc.c

stmmac: make function tables const

2010-10-16 11:13:25 -07:00

Kconfig

drivers/net/stmmac/: add HAS_IOMEM dependency

2010-10-06 23:42:43 -07:00

Makefile

stmmac: rework normal and enhanced descriptors

2010-04-14 04:49:50 -07:00

norm_desc.c

Fix common misspellings

2011-03-31 11:26:23 -03:00

stmmac_ethtool.c

net: stmmac: convert to hw_features

2011-04-10 18:55:19 -07:00

stmmac_main.c

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

2011-04-11 13:44:25 -07:00

stmmac_mdio.c

stmmac: tidy-up stmmac_priv structure

2010-11-24 11:14:24 -08:00

stmmac_timer.c

drivers/net: Remove unnecessary returns from void function()s

2010-05-14 00:19:28 -07:00

stmmac_timer.h

stmmac: do not fail when the timer cannot be used.

2009-11-23 10:37:52 -08:00

stmmac.h

stmmac: update the driver version

2010-11-24 11:14:25 -08:00