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

Conflicts:
	drivers/net/wireless/iwlwifi/iwl-3945.h
	drivers/net/wireless/iwlwifi/iwl-tx.c
	drivers/net/wireless/iwlwifi/iwl3945-base.c

2009-07-30 19:22:43 -07:00

..

3c359.c

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

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

3c359.h

3C359: use request_firmware

2009-03-30 20:02:50 +05:30

abyss.c

…

abyss.h

…

ibmtr.c

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

2009-07-30 19:22:43 -07:00

Kconfig

…

lanstreamer.c

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

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

lanstreamer.h

…

madgemc.c

tokenring: convert drivers to net_device_ops

2009-03-27 00:46:43 -07:00

madgemc.h

…

Makefile

…

olympic.c

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

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

olympic.h

…

proteon.c

tokenring: convert drivers to net_device_ops

2009-03-27 00:46:43 -07:00

skisa.c

tokenring: convert drivers to net_device_ops

2009-03-27 00:46:43 -07:00

smctr.c

net: convert remaining non-symbolic return values in ndo_start_xmit() functions

2009-07-05 19:23:38 -07:00

smctr.h

…

tms380tr.c

net: convert remaining non-symbolic return values in ndo_start_xmit() functions

2009-07-05 19:23:38 -07:00

tms380tr.h

…

tmspci.c

…