Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux...
authorDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 30 Oct 2010 11:35:11 +0000 (12:35 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Sat, 30 Oct 2010 11:35:11 +0000 (12:35 +0100)
commit67577927e8d7a1f4b09b4992df640eadc6aacb36
tree2e9efe6b5745965faf0dcc084d4613d9356263f9
parent6fe4c590313133ebd5dadb769031489ff178ece1
parent51f00a471ce8f359627dd99aeac322947a0e491b
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6.git

Conflicts:
drivers/mtd/mtd_blkdevs.c

Merge Grant's device-tree bits so that we can apply the subsequent fixes.

Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
arch/powerpc/Kconfig
drivers/mtd/chips/cfi_cmdset_0002.c
drivers/mtd/devices/m25p80.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/pcmciamtd.c
drivers/mtd/mtd_blkdevs.c
drivers/mtd/mtdchar.c
drivers/mtd/nand/omap2.c
fs/jffs2/fs.c