James Bottomley 00dd7b7d26 Merge ../linux-2.6 ... Conflicts: arch/ia64/hp/sim/simscsi.c Stylistic differences in two separate fixes for buffer->request_buffer problem. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>		2006-08-06 12:42:33 -05:00
..
block	[S390] xpram module parameter parsing - take 2.	2006-07-17 16:09:23 +02:00
char	[S390] sysfs_create_xxx return values.	2006-07-18 13:46:58 +02:00
cio	[S390] duplicate ccw devices in ccwgroup.	2006-07-27 14:00:33 +02:00
crypto	[PATCH] devfs: Remove the miscdevice devfs_name field as it's no longer needed	2006-06-26 12:25:08 -07:00
net	[S390] sysfs_create_xxx return values.	2006-07-18 13:46:58 +02:00
scsi	[SCSI] zfcp: bump version number	2006-08-06 11:31:33 -05: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	[S390] path grouping and path verifications fixes.	2006-07-12 16:40:19 +02:00
s390mach.h	[PATCH] s390: Add missing memory constraint to stcrw()	2006-02-01 08:53:24 -08:00
sysinfo.c	Remove obsolete #include <linux/config.h>	2006-06-30 19:25:36 +02:00