git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 7e17388 28171ef)

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	820f67e5c9c66a0d41ee545f8e9841d047dad952
tree	9e88d648396ac99a90d12ccf5471d001e87c65ae	tree \| snapshot
parent	7e173888b88385ba1cd497e4c5b567270e7d1005	commit \| diff
parent	28171ef201b894f9bbd67b9b9617ee3281386591	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 Kernel Source Tree.