linux_old1/drivers/s390
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 virtio: set device index in common code. 2008-05-30 15:09:42 +10:00
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 s390: KVM guest: virtio device support, and kvm hypercalls 2008-04-27 12:00:51 +03:00
ebcdic.c Linux-2.6.12-rc2 2005-04-16 15:20:36 -07:00
s390_rdev.c [PATCH] s390: kzalloc() conversion in drivers/s390 2006-03-24 07:33:18 -08:00
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 [S390] Add new fields for System z10 to /proc/sysinfo 2008-04-17 07:47:01 +02:00