tree 9e88d648396ac99a90d12ccf5471d001e87c65ae
parent f093182d313edde9b1f86dbdaf40ba4da2dbd0e7
parent 3da8b713da723e78a03f0404beedf3cc6f4f860b
author James Bottomley <jejb@mulgrave.(none)> 1131472226 -0500
committer James Bottomley <jejb@mulgrave.(none)> 1131472226 -0500

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

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