Merge branch 'next-mtd' of git://aeryn.fluff.org.uk/bjdooks/linux

author David Woodhouse <David.Woodhouse@intel.com>

Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)

committer David Woodhouse <David.Woodhouse@intel.com>

Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)
author David Woodhouse <David.Woodhouse@intel.com>
Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)
committer David Woodhouse <David.Woodhouse@intel.com>
Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)
diff --cc Documentation/kernel-parameters.txt
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/mtd/nand/mxc_nand.c
Simple merge
diff --cc drivers/mtd/nand/s3c2410.c
Simple merge
author	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 8 Jun 2009 11:21:27 +0000 (12:21 +0100)
		1	2
Documentation/kernel-parameters.txt	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/mxc_nand.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/s3c2410.c	patch \|	diff1 \|	diff2 \|	blob \| history