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
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
madgemc.h
Makefile
olympic.c	tokenring: convert to use netdev_for_each_mc_addr	2010-02-18 14:47:51 -08:00
olympic.h
proteon.c
skisa.c
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
tms380tr.c	Merge branch 'for-next' into for-linus	2010-03-08 16:55:37 +01:00
tms380tr.h
tmspci.c	drivers/net/: use DEFINE_PCI_DEVICE_TABLE()	2010-01-07 23:54:26 -08:00