Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 10 May 2010 13:32:46 +0000 (14:32 +0100)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Mon, 10 May 2010 13:32:46 +0000 (14:32 +0100)
commit0ae28a35bcb7984838acbf28bfba9c030f8b74f0
tree4f449d929b5df9e126e839f388ff0fd2b52028a0
parent6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5
parentb57f95a38233a2e73b679bea4a5453a1cc2a1cc9
Merge branch 'master' of git://git./linux/kernel/git/torvalds/linux-2.6

Conflicts:
drivers/mtd/mtdcore.c

Pull in the bdi fixes and ARM platform changes that other outstanding
patches depend on.
21 files changed:
MAINTAINERS
drivers/mtd/Makefile
drivers/mtd/devices/block2mtd.c
drivers/mtd/devices/sst25l.c
drivers/mtd/lpddr/lpddr_cmds.c
drivers/mtd/maps/bfin-async-flash.c
drivers/mtd/maps/physmap_of.c
drivers/mtd/maps/pismo.c
drivers/mtd/mtdcore.c
drivers/mtd/mtdsuper.c
drivers/mtd/nand/bcm_umi_nand.c
drivers/mtd/nand/cafe_nand.c
drivers/mtd/nand/davinci_nand.c
drivers/mtd/nand/fsl_upm.c
drivers/mtd/nand/nomadik_nand.c
drivers/mtd/nand/omap2.c
drivers/mtd/nand/orion_nand.c
drivers/mtd/nand/pxa3xx_nand.c
drivers/mtd/nand/sh_flctl.c
drivers/mtd/nand/tmio_nand.c
drivers/mtd/onenand/omap2.c