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

Conflicts:
	drivers/net/stmmac/stmmac_main.c
	drivers/net/wireless/wl12xx/wl1271_cmd.c
	drivers/net/wireless/wl12xx/wl1271_main.c
	drivers/net/wireless/wl12xx/wl1271_spi.c
	net/core/ethtool.c
	net/mac80211/scan.c

2010-04-11 14:53:53 -07:00

..

3c359.c

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

2010-04-11 14:53:53 -07:00

3c359.h

3C359: use request_firmware

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

abyss.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00

abyss.h

MAINTAINERS: remove Adam Fritzler, remove his email address in other sources

2008-02-03 16:36:24 +02:00

ibmtr.c

net: convert multicast list to list_head

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

Kconfig

net: Allow dependancies of FDDI & Tokenring to be modular.

2008-12-27 20:43:48 -08:00

lanstreamer.c

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

2010-04-11 14:53:53 -07:00

lanstreamer.h

lanstreamer: convert to internal network stats

2009-01-21 14:02:27 -08:00

madgemc.c

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

madgemc.h

MAINTAINERS: remove Adam Fritzler, remove his email address in other sources

2008-02-03 16:36:24 +02:00

Makefile

…

olympic.c

net: convert multicast list to list_head

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

olympic.h

olympic: convert to internal network device stats

2009-01-21 14:02:29 -08:00

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

include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h

2010-03-30 22:02:32 +09:00

smctr.h

drivers/net/tokenring: fix sparse warning: cast truncates bits from const value

2009-02-17 19:49:21 -08:00

tms380tr.c

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

2010-04-11 14:53:53 -07:00

tms380tr.h

tms380tr: convert to net_device_ops

2009-01-21 14:02:30 -08:00

tmspci.c

drivers/net/: use DEFINE_PCI_DEVICE_TABLE()

2010-01-07 23:54:26 -08:00