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

Conflicts:
	drivers/net/wireless/iwmc3200wifi/netdev.c
	net/wireless/scan.c

2009-07-23 19:03:51 -07:00

..

am79c961a.c

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-05 19:16:04 -07:00

am79c961a.h

…

at91_ether.c

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

2009-07-23 19:03:51 -07:00

at91_ether.h

…

ep93xx_eth.c

net: replace dma_sync_single with dma_sync_single_for_cpu

2009-05-29 01:51:22 -07:00

ether1.c

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-05 19:16:04 -07:00

ether1.h

…

ether3.c

net: use NETDEV_TX_OK instead of 0 in ndo_start_xmit() functions

2009-07-05 19:16:04 -07:00

ether3.h

…

etherh.c

…

ixp4xx_eth.c

netdev: restore MTU change operation

2009-07-12 14:20:04 -07:00

Kconfig

Add mac driver for w90p910

2009-07-20 07:45:05 -07:00

ks8695net.c

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

2009-03-05 02:06:47 -08:00

ks8695net.h

…

Makefile

Add mac driver for w90p910

2009-07-20 07:45:05 -07:00

w90p910_ether.c

Add mac driver for w90p910

2009-07-20 07:45:05 -07:00