err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

projects / linux-2.6 / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f093182 3da8b71)

author	James Bottomley <jejb@mulgrave.(none)>
	Tue, 8 Nov 2005 17:50:26 +0000 (12:50 -0500)
committer	James Bottomley <jejb@mulgrave.(none)>
	Tue, 8 Nov 2005 17:50:26 +0000 (12:50 -0500)
commit	383f9749505cef0a30dbd7109db7fe469aa64753
tree	9e88d648396ac99a90d12ccf5471d001e87c65ae	tree \| snapshot
parent	f093182d313edde9b1f86dbdaf40ba4da2dbd0e7	commit \| diff
parent	3da8b713da723e78a03f0404beedf3cc6f4f860b	commit \| diff

Merge by hand (conflicts between pending drivers and kfree cleanups)

Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

drivers/block/cciss.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ide-scsi.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/ips.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/megaraid/megaraid_mbox.c	diff1 \|	diff2 \|	blob \| history
drivers/scsi/raid_class.c	diff1 \|	diff2 \|	blob \| history
include/linux/pci_ids.h	diff1 \|	diff2 \|	blob \| history

Linux 2.6 source tree