git.monstr.eu Git - linux-2.6-microblaze.git/commit

projects / linux-2.6-microblaze.git / commit

author	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 10 May 2010 13:32:46 +0000 (14:32 +0100)
committer	David Woodhouse <David.Woodhouse@intel.com>
	Mon, 10 May 2010 13:32:46 +0000 (14:32 +0100)
commit	0ae28a35bcb7984838acbf28bfba9c030f8b74f0
tree	4f449d929b5df9e126e839f388ff0fd2b52028a0	tree
parent	6f1f3d0ab5c3eeea9f04486481c25e9afdfa26c5	commit \| diff
parent	b57f95a38233a2e73b679bea4a5453a1cc2a1cc9	commit \| diff

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	diff1 \|	diff2 \|	blob \| history
drivers/mtd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/block2mtd.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/sst25l.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/lpddr/lpddr_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/bfin-async-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/physmap_of.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/pismo.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdcore.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdsuper.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/bcm_umi_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/cafe_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/davinci_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_upm.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nomadik_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/orion_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/sh_flctl.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/tmio_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/omap2.c	diff1 \|	diff2 \|	blob \| history

MicroBlaze GIT Repository

RSS Atom

MAINTAINERS	diff1 \|	diff2 \|	blob \| history
drivers/mtd/Makefile	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/block2mtd.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/devices/sst25l.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/lpddr/lpddr_cmds.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/bfin-async-flash.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/physmap_of.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/maps/pismo.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdcore.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/mtdsuper.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/bcm_umi_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/cafe_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/davinci_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/fsl_upm.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/nomadik_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/omap2.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/orion_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/pxa3xx_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/sh_flctl.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/nand/tmio_nand.c	diff1 \|	diff2 \|	blob \| history
drivers/mtd/onenand/omap2.c	diff1 \|	diff2 \|	blob \| history