Merge branch 'master' of ssh://git.infradead.org/srv/git/mtd-2.6
authorDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 Oct 2007 17:22:26 +0000 (13:22 -0400)
committerDavid Woodhouse <dwmw2@infradead.org>
Sat, 6 Oct 2007 17:22:26 +0000 (13:22 -0400)

Trivial merge