From: Linus Torvalds <torvalds@g5.osdl.org>
Date: Mon, 7 Nov 2005 18:24:08 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
X-Git-Tag: v2.6.15-rc1~448
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3ce1debe2685383a9ad6ace9c49869c3968c013;p=pandora-kernel.git

Merge /pub/scm/linux/kernel/git/tglx/mtd-2.6

Some manual fixups for clashing kfree() cleanups etc.
---

b3ce1debe2685383a9ad6ace9c49869c3968c013
Reading git-diff-tree failed