Merge branch 'mtd-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/galak/powerpc
authorDavid Woodhouse <dwmw2@infradead.org>
Thu, 23 Aug 2007 09:44:17 +0000 (10:44 +0100)
committerDavid Woodhouse <dwmw2@infradead.org>
Thu, 23 Aug 2007 09:44:17 +0000 (10:44 +0100)

Trivial merge