Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Nov 2005 21:04:07 +0000 (13:04 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Tue, 29 Nov 2005 21:04:07 +0000 (13:04 -0800)

Trivial merge