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
..
fc.c	[NET]: Move hardware header operations out of netdevice.	2007-10-10 16:52:52 -07:00
fddi.c	[NET]: Move hardware header operations out of netdevice.	2007-10-10 16:52:52 -07:00
garp.c	garp: retry sending JoinIn messages after allocation failures	2008-07-16 20:51:47 -07:00
hippi.c	[NET]: Move hardware header operations out of netdevice.	2007-10-10 16:52:52 -07:00
Kconfig	net: Add GARP applicant-only participant	2008-07-05 21:26:13 -07:00
Makefile	net: Add GARP applicant-only participant	2008-07-05 21:26:13 -07:00
p8022.c	[LLC]: Use refcounting with struct llc_sap	2005-09-22 04:43:05 -03:00
p8023.c	[NET]: Wrap netdevice hardware header creation.	2007-10-10 16:52:50 -07:00
psnap.c	rcu: split list.h and move rcu-protected lists into rculist.h	2008-05-19 10:01:37 +02:00
stp.c	net: Add STP demux layer	2008-07-05 21:25:39 -07:00
tr.c	[TR] net/802/tr.c: sysctl_tr_rif_timeout static	2008-01-31 19:28:31 -08:00