David S. Miller ff9c38bba3 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 ... Conflicts: net/mac80211/ht.c		2009-12-01 22:13:38 -08: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	ep93xx-eth: check for zero MAC address on probe, not on device open	2009-11-29 23:50:32 -08: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	Revert "etherh: Get working again."	2009-02-22 19:54:16 -08:00
ixp4xx_eth.c	netdev: drivers should make ethtool_ops const	2009-09-02 01:03:33 -07:00
Kconfig	Add mac driver for w90p910	2009-07-20 07:45:05 -07:00
ks8695net.c	KS8695: fix ks8695_rx() unreasonable action.	2009-11-16 23:51:47 -08:00
ks8695net.h
Makefile	Add mac driver for w90p910	2009-07-20 07:45:05 -07:00
w90p910_ether.c	ARM: fix bug of checking on signed return value using unsigned statement in w90p910 platform	2009-11-13 20:38:50 -08:00