Merge master.kernel.org:/pub/scm/linux/kernel/git/tglx/mtd-2.6
authorLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 19:19:30 +0000 (12:19 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 13 Jul 2005 19:19:30 +0000 (12:19 -0700)

Trivial merge