Merge with mainline to remove plat-omap/Kconfig conflict
authorTony Lindgren <tony@atomide.com>
Mon, 1 Mar 2010 22:19:05 +0000 (14:19 -0800)
committerTony Lindgren <tony@atomide.com>
Mon, 1 Mar 2010 22:19:05 +0000 (14:19 -0800)
commitd702d12167a2c05a346f49aac7a311d597762495
treebaae42c299cce34d6df24b5d01f8b1d0b481bd9a
parent9418c65f9bd861d0f7e39aab9cfb3aa6f2275d11
parentac0f6f927db539e03e1f3f61bcd4ed57d5cde7a9
Merge ... mainline to remove plat-omap/Kconfig conflict

Conflicts:
arch/arm/plat-omap/Kconfig
arch/arm/configs/omap_4430sdp_defconfig
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/plat-omap/Kconfig
arch/arm/plat-omap/include/plat/omap44xx.h
arch/arm/plat-omap/io.c
drivers/char/hw_random/Kconfig
drivers/mfd/Kconfig
drivers/mtd/maps/Kconfig
drivers/mtd/maps/Makefile
drivers/spi/Kconfig
sound/soc/omap/omap-mcbsp.c