Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
authorDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 25 Jul 2008 14:40:14 +0000 (10:40 -0400)
committerDavid Woodhouse <David.Woodhouse@intel.com>
Fri, 25 Jul 2008 14:40:14 +0000 (10:40 -0400)
commitff877ea80efa2015b6263766f78ee42c2a1b32f9
tree85205005c611ab774702148558321c6fb92f1ccd
parent30821fee4f0cb3e6d241d9f7ddc37742212e3eb7
parentd37e6bf68fc1eb34a4ad21d9ae8890ed37ea80e7
Merge branch 'linux-next' of git://git.infradead.org/~dedekind/ubi-2.6
22 files changed:
arch/arm/mach-at91/at91cap9_devices.c
arch/arm/mach-at91/at91sam9260_devices.c
arch/arm/mach-at91/at91sam9261_devices.c
arch/arm/mach-at91/at91sam9263_devices.c
arch/arm/mach-at91/at91sam9rl_devices.c
arch/arm/mach-at91/board-cap9adk.c
arch/arm/mach-at91/board-dk.c
arch/arm/mach-at91/board-kb9202.c
arch/arm/mach-at91/board-sam9rlek.c
arch/arm/mach-at91/board-yl-9200.c
arch/avr32/boards/atstk1000/atstk1002.c
arch/avr32/mach-at32ap/at32ap700x.c
drivers/mtd/devices/block2mtd.c
drivers/mtd/ftl.c
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/mtd/maps/pcmciamtd.c
drivers/mtd/mtdchar.c
include/asm-arm/arch-at91/board.h
include/asm-avr32/arch-at32ap/board.h
include/linux/mtd/map.h
include/linux/mtd/mtd.h