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)
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>

Trivial merge