Merge git://git.infradead.org/~dwmw2/mtd-2.6.23
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Sep 2007 07:39:50 +0000 (00:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 4 Sep 2007 07:39:50 +0000 (00:39 -0700)

Trivial merge