David S. Miller 49997d7515 Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: Documentation/powerpc/booting-without-of.txt drivers/atm/Makefile drivers/net/fs_enet/fs_enet-main.c drivers/pci/pci-acpi.c net/8021q/vlan.c net/iucv/iucv.c		2008-07-18 02:39:39 -07:00
..
3c359.c	3c359: use netstats in net_device structure	2008-05-13 01:35:25 -04:00
3c359.h	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6	2008-05-25 23:26:10 -07:00
3c359_microcode.h
abyss.c	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00
abyss.h	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00
ibmtr.c
Kconfig
lanstreamer.c
lanstreamer.h
madgemc.c	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02: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]: Undo code bloat in hot paths due to print_mac().	2008-04-08 16:50:44 -07:00
olympic.h	drivers/net/tokenring/olympic.c: fix warning	2008-05-22 06:03:30 -04:00
proteon.c	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00
skisa.c	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00
smctr.c	smctr: use request_firmware()	2008-07-10 14:47:50 +01:00
smctr.h	smctr: use request_firmware()	2008-07-10 14:47:50 +01:00
tms380tr.c	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00
tms380tr.h	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00
tmspci.c	MAINTAINERS: remove Adam Fritzler, remove his email address in other sources	2008-02-03 16:36:24 +02:00