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
..
block	[S390] dasd: use -EOPNOTSUPP instead of -ENOTSUPP	2008-07-17 17:22:10 +02:00
char	[S390] vmur: Fix return code handling.	2008-07-17 17:22:09 +02:00
cio	[S390] qdio: new qdio driver.	2008-07-17 17:22:10 +02:00
crypto	Merge branch 'bkl-removal' of git://git.lwn.net/linux-2.6	2008-07-14 14:48:31 -07:00
kvm	…
net	Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6	2008-07-18 02:39:39 -07:00
scsi	[S390] qdio: new qdio driver.	2008-07-17 17:22:10 +02:00
Makefile	…
ebcdic.c	…
s390_rdev.c	…
s390mach.c	[S390] stp support.	2008-07-14 10:02:09 +02:00
s390mach.h	[S390] stp support.	2008-07-14 10:02:09 +02:00
sysinfo.c	…