Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Sun, 13 Nov 2005 20:30:14 +0000 (12:30 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Sun, 13 Nov 2005 20:30:14 +0000 (12:30 -0800)

Trivial merge