Jiri Kosina 318ae2edc3 Merge branch 'for-next' into for-linus ...

Conflicts:
	Documentation/filesystems/proc.txt
	arch/arm/mach-u300/include/mach/debug-macro.S
	drivers/net/qlge/qlge_ethtool.c
	drivers/net/qlge/qlge_main.c
	drivers/net/typhoon.c

2010-03-08 16:55:37 +01:00

..

3c359.c

tokenring: convert to use netdev_for_each_mc_addr

2010-02-18 14:47:51 -08: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

…

ibmtr.c

tokenring: convert to use netdev_for_each_mc_addr

2010-02-18 14:47:51 -08:00

Kconfig

…

lanstreamer.c

tokenring: convert to use netdev_for_each_mc_addr

2010-02-18 14:47:51 -08: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

tokenring: convert to use netdev_for_each_mc_addr

2010-02-18 14:47:51 -08: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

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial

2009-12-09 19:43:33 -08: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 'for-next' into for-linus

2010-03-08 16:55:37 +01: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