Jeff Garzik 983f27d37d Merge branch 'upstream-fixes' into upstream ... Conflicts: drivers/s390/net/ctctty.c		2006-05-26 22:01:26 -04:00
..
block	[PATCH] s390: dasd device identifiers	2006-04-28 08:33:48 -07:00
char	[PATCH] s390: tape 3590 changes	2006-04-28 08:33:48 -07:00
cio	[PATCH] s390: fix slab debugging	2006-04-28 08:33:48 -07:00
crypto
net	Merge branch 'upstream-fixes' into upstream	2006-05-26 22:01:26 -04:00
scsi
ebcdic.c
Kconfig
Makefile
s390_rdev.c
s390mach.c	[PATCH] s390: fix ipd handling	2006-05-01 18:17:46 -07:00
s390mach.h
sysinfo.c