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

Conflicts:
	net/mac80211/main.c

2010-09-09 22:27:33 -07:00

..

common.h

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

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

descs.h

…

dwmac100_core.c

stmmac: Fix another build warning.

2010-08-31 20:56:48 -07:00

dwmac100_dma.c

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

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

dwmac100.h

…

dwmac1000_core.c

stmmac: Fix build warnings.

2010-08-30 21:55:17 -07:00

dwmac1000_dma.c

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

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

dwmac1000.h

stmmac: fix automatic PAD/FCS stripping

2010-07-27 20:43:50 -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 ioaddr 'void __iomem *' rather than unsigned long

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

Kconfig

stmmac: Make time functionality depend upon RTC_HCTOSYS_DEVICE

2010-08-26 20:32:02 -07:00

Makefile

…

norm_desc.c

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

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

stmmac_ethtool.c

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

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

stmmac_main.c

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

2010-09-09 22:27:33 -07:00

stmmac_mdio.c

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

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

stmmac_timer.c

…

stmmac_timer.h

…

stmmac.h

stmmac: Fix build warnings.

2010-08-30 21:55:17 -07:00