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

Conflicts:
	drivers/net/bonding/bond_main.c
	drivers/net/via-velocity.c
	drivers/net/wireless/iwlwifi/iwl-agn.c

2010-04-06 23:53:30 -07:00

..

common.h

stmmac: fix 'lenght' typo in comments and code

2010-02-04 09:33:21 -08:00

descs.h

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

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

dwmac100.c

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

dwmac100.h

stmmac: rename mac100 as dwmac100 and fix spare coding style

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

dwmac1000_core.c

net: convert multicast list to list_head

2010-04-03 14:22:15 -07:00

dwmac1000_dma.c

stmmac: fix 'lenght' typo in comments and code

2010-02-04 09:33:21 -08:00

dwmac1000.h

stmmac: include netdevice.h into the common.h header

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

dwmac_dma.h

stmmac: move the dma out from the main

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

dwmac_lib.c

stmmac: move the dma out from the main

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

Kconfig

stmmac: fix kconfig for crc32 build error

2010-04-01 17:25:59 -07:00

Makefile

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

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

stmmac_ethtool.c

stmmac: fix 'lenght' typo in comments and code

2010-02-04 09:33:21 -08:00

stmmac_main.c

net/various: remove trailing space in messages

2010-03-24 14:10:38 -07:00

stmmac_mdio.c

stmmac: include netdevice.h into the common.h header

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

stmmac_timer.c

stmmac: fixed a compilation error when use the external timer

2009-11-23 10:37:47 -08: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's module version

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