James Bottomley 2a1e1379ba Merge by hand (conflicts in scsi_lib.c) ... This merge is pretty extensive. The conflict is over the new req->retries parameter, so I had to change the prototype to scsi_setup_blk_pc_cmnd() and the usage in sd, sr and st. Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>		2005-12-15 17:35:24 -06:00
..
acpi
asm-alpha
asm-arm	[ARM] 3205/1: Handle new EABI relocations when loading kernel modules.	2005-12-14 22:04:22 +00:00
asm-arm26
asm-cris
asm-frv
asm-generic
asm-h8300
asm-i386
asm-ia64	[IA64] Split 16-bit severity field in sal_log_record_header	2005-12-13 10:41:49 -08:00
asm-m32r
asm-m68k
asm-m68knommu
asm-mips	[PATCH] ide: AU1200 IDE update	2005-12-15 02:17:46 +01:00
asm-parisc
asm-powerpc
asm-ppc
asm-s390
asm-sh
asm-sh64
asm-sparc	[PATCH] sun4c_memerr_reg __iomem annotations	2005-12-15 10:01:29 -08:00
asm-sparc64
asm-um
asm-v850
asm-x86_64
asm-xtensa
keys
linux	Merge by hand (conflicts in scsi_lib.c)	2005-12-15 17:35:24 -06:00
math-emu
media	[PATCH] V4L/DVB: (3086c) Whitespaces cleanups part 4	2005-12-12 08:57:44 -08:00
mtd
net
pcmcia
rdma
rxrpc
scsi	Merge by hand (conflicts in scsi_lib.c)	2005-12-15 17:35:24 -06:00
sound
video