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)
commite635a01ea0a16cf7cd31ecd2305870385dca9be6
treec7153e7dee5caf6ac90d85694ff27e4d0b606290
parent143070e74630b9557e1bb64d899ff2cc5a1dcb48
parent947391cfbaa3b08558844c0b187bcd0223c3f660
Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux
Documentation/kernel-parameters.txt
MAINTAINERS
drivers/mtd/nand/mxc_nand.c
drivers/mtd/nand/s3c2410.c