David Woodhouse 66643de455 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 ... Conflicts: include/asm-powerpc/unistd.h include/asm-sparc/unistd.h include/asm-sparc64/unistd.h Signed-off-by: David Woodhouse <dwmw2@infradead.org>		2006-05-24 09:22:21 +01: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	Move user-visible parts of drivers/s390/crypto/z90crypt.h to include/asm-s390	2006-05-08 15:51:57 +01:00
net	[PATCH] s390: lcs incorrect test	2006-05-15 11:20:55 -07:00
scsi	[PATCH] mempool: use common mempool kmalloc allocator	2006-03-26 08:56:59 -08:00
ebcdic.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
Kconfig	[PATCH] s390: 3590 tape driver	2006-03-24 07:33:18 -08:00
Makefile	[PATCH] s390: move s390_root_dev_* out of the cio layer	2006-01-06 08:33:49 -08:00
s390_rdev.c	[PATCH] s390: kzalloc() conversion in drivers/s390	2006-03-24 07:33:18 -08:00
s390mach.c	[PATCH] s390: fix ipd handling	2006-05-01 18:17:46 -07:00
s390mach.h	[PATCH] s390: Add missing memory constraint to stcrw()	2006-02-01 08:53:24 -08:00
sysinfo.c	[PATCH] s390: cleanup Kconfig	2006-01-06 08:33:53 -08:00