Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)

Trivial merge