From: James Bottomley <jejb@mulgrave.(none)>
Date: Tue, 8 Nov 2005 17:50:26 +0000 (-0500)
Subject: Merge by hand (conflicts between pending drivers and kfree cleanups)
X-Git-Tag: v2.6.15-rc1~7^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=383f9749505cef0a30dbd7109db7fe469aa64753;p=pandora-kernel.git

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

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

383f9749505cef0a30dbd7109db7fe469aa64753
Reading git-diff-tree failed