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

Conflicts:
	drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
	net/llc/af_llc.c

2010-12-08 13:47:38 -08:00

..

common.h

stmmac: make function tables const

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

descs.h

…

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: make ioaddr 'void __iomem *' rather than unsigned long

2010-08-25 16:30:51 -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

…

norm_desc.c

stmmac: make function tables const

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

stmmac_ethtool.c

net: Fix too optimistic NETIF_F_HW_CSUM features

2010-12-06 12:59:04 -08:00

stmmac_main.c

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

2010-12-08 13:47:38 -08: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.h

stmmac: update the driver version

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