]> nv-tegra.nvidia Code Review - linux-2.6.git/commit
Merge by hand (conflicts between pending drivers and kfree cleanups)
authorJames Bottomley <jejb@mulgrave.(none)>
Tue, 8 Nov 2005 17:50:26 +0000 (12:50 -0500)
committerJames Bottomley <jejb@mulgrave.(none)>
Tue, 8 Nov 2005 17:50:26 +0000 (12:50 -0500)
commit383f9749505cef0a30dbd7109db7fe469aa64753
tree9e88d648396ac99a90d12ccf5471d001e87c65ae
parentf093182d313edde9b1f86dbdaf40ba4da2dbd0e7
parent3da8b713da723e78a03f0404beedf3cc6f4f860b
Merge by hand (conflicts between pending drivers and kfree cleanups)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
drivers/block/cciss.c
drivers/scsi/ide-scsi.c
drivers/scsi/ips.c
drivers/scsi/megaraid/megaraid_mbox.c
drivers/scsi/raid_class.c
include/linux/pci_ids.h