Merge branch 'omap1-part2' into omap1
authorTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000 (05:31 -0800)
committerTony Lindgren <tony@atomide.com>
Fri, 20 Jan 2012 13:31:52 +0000 (05:31 -0800)
commit967809bd7faf71ddc29c8081e0f21db8b201a0f4
tree256bcce2b13a45b573b02ef73dcebe1f08a03593
parentdcd6c92267155e70a94b3927bce681ce74b80d1f
parent8d09a1bb3147ddbcf0a9483021ca699c54c54732
Merge branch 'omap1-part2' into omap1

Conflicts:
drivers/leds/leds-ams-delta.c
arch/arm/mach-omap1/board-ams-delta.c
drivers/leds/Kconfig
drivers/leds/Makefile
drivers/mtd/nand/ams-delta.c
drivers/video/omap/lcd_ams_delta.c
sound/soc/omap/ams-delta.c