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

..

3c574_cs.c

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

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

3c589_cs.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

axnet_cs.c

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

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

com20020_cs.c

netdevice: safe convert to netdev_priv() #part-2

2008-11-12 23:38:14 -08:00

fmvj18x_cs.c

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

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

ibmtr_cs.c

section misannotation in ibmtr_cs

2008-11-30 10:03:37 -08:00

Kconfig

[netdrvr] ibmtr: PCMCIA IBMTR is ok on 64bit

2008-10-16 05:40:16 -04:00

Makefile

Linux-2.6.12-rc2

2005-04-16 15:20:36 -07:00

nmclan_cs.c

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

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

pcnet_cs.c

pcnet_cs: add new id

2009-07-05 18:03:27 -07:00

smc91c92_cs.c

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

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

xirc2ps_cs.c

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

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