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
..
acorn
acpi	[PATCH] ACPI: fix sleeping whilst atomic warnings on resume	2005-12-12 08:57:45 -08:00
atm	[PATCH] drivers/atm/adummy.c NULL noise removal	2005-12-15 10:04:31 -08:00
base	[PATCH] drivers/base/memory.c: unexport the static (sic) memory_sysdev_class	2005-12-15 14:22:45 -08:00
block	[PATCH] cciss: fix for deregister_disk	2005-12-12 22:31:16 -08:00
bluetooth
cdrom
char	[PATCH] IPMI oops fix	2005-12-15 14:22:45 -08:00
connector	[PATCH] Add timestamp field to process events	2005-12-12 08:57:42 -08:00
cpufreq	[PATCH] clean up lock_cpu_hotplug() in cpufreq	2005-11-28 14:42:23 -08:00
crypto
dio
eisa
fc4
firmware	[PATCH] dell_rbu: NULL noise removal	2005-12-15 10:04:30 -08:00
hwmon	[PATCH] hwmon: w83792d fix unused fan pins	2005-11-29 21:39:22 -08:00
i2c
ide	[PATCH] ide-cd: remove write-only cmd field from struct cdrom_info	2005-12-15 02:20:49 +01:00
ieee1394
infiniband	IB/uverbs: track multicast group membership for userspace QPs	2005-11-29 16:57:01 -08:00
input	[PATCH] drivers/input/misc/wistron_btns.c NULL noise removal	2005-12-15 10:04:31 -08:00
isdn
macintosh	[PATCH] Fix windfarm model-id table	2005-12-09 15:42:17 +11:00
mca
md	[SCSI] seperate max_sectors from max_hw_sectors	2005-12-15 15:11:40 -08:00
media	[PATCH] dst_ca __user annotations, portability fixes	2005-12-15 10:04:31 -08:00
message	[SCSI] mptfusion - bump version	2005-12-13 18:41:48 -07:00
mfd	[PATCH] input: fix ucb1x00-ts breakage after conversion to dynamic input_dev allocation	2005-12-12 08:57:45 -08:00
misc
mmc	[MMC] Explain the internals of mmc_power_up()	2005-12-14 14:57:35 +00:00
mtd	[PATCH] blkmtd: use clear_page_dirty()	2005-12-12 08:57:41 -08:00
net	[PATCH] s2io: __iomem annotations for recent changes	2005-12-15 10:04:29 -08:00
nubus
oprofile
parisc
parport
pci	[PATCH] PCI: kernel-doc fix for pci-acpi.c	2005-11-23 23:04:27 -08:00
pcmcia	[PATCH] m32r: M3A-2170(Mappi-III) IDE support	2005-11-28 14:42:24 -08:00
pnp
rapidio
s390	[SCSI] zfcp: fix return code of zfcp_scsi_slave_alloc	2005-12-01 15:59:49 -06:00
sbus	[PATCH] sbus/char/uctrl: missing prototypes and NULL noise removal	2005-12-15 10:01:28 -08:00
scsi	Merge by hand (conflicts in scsi_lib.c)	2005-12-15 17:35:24 -06:00
serial	[SERIAL] 8250_pci: Remove redundant assignment, and mark fallthrough.	2005-12-07 18:11:26 +00:00
sh
sn
tc
telephony
usb	[PATCH] auerswald.c: %zd for size_t	2005-12-15 10:04:29 -08:00
video	[PATCH] arcfb __user annotations	2005-12-15 10:04:30 -08:00
w1
zorro
Kconfig
Makefile	Link USB drivers later in the kernel	2005-12-03 20:50:51 -08:00