original_kernel/drivers/s390
David S. Miller 4dd565134e Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:

	drivers/net/e1000e/ich8lan.c
	drivers/net/e1000e/netdev.c
2008-10-08 14:56:41 -07:00
..
block [S390] dcss: fix build bug. 2008-08-25 18:15:01 +02:00
char [S390] drivers/s390: Use an IS_ERR test rather than a NULL test 2008-08-21 19:46:39 +02:00
cio [S390] qdio: prevent stack clobber 2008-10-03 21:55:55 +02:00
crypto
kvm [S390] virtio console: fix section mismatch warning. 2008-08-01 16:39:35 +02:00
net qeth: avoid qeth recovery problems 2008-09-24 20:47:57 -04:00
scsi [SCSI] zfcp: Remove duplicated unlikely() macros. 2008-08-29 09:05:05 -05:00
Makefile
ebcdic.c
s390_rdev.c
s390mach.c
s390mach.h
sysinfo.c