Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 18:24:08 +0000 (10:24 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Mon, 7 Nov 2005 18:24:08 +0000 (10:24 -0800)
Some manual fixups for clashing kfree() cleanups etc.


Trivial merge