Merge branch 'omap1-part2' into omap1

Conflicts:
	drivers/leds/leds-ams-delta.c

diff --cc arch/arm/mach-omap1/board-ams-delta.c
index 88909cc,673cf21..87b1303
--- 1/arch/arm/mach-omap1/board-ams-delta.c
--- 2/arch/arm/mach-omap1/board-ams-delta.c
+++ b/arch/arm/mach-omap1/board-ams-delta.c
@@@ -386,8 -537,4 +537,5 @@@ MACHINE_START(AMS_DELTA, "Amstrad E3 (D
        .init_irq       = omap1_init_irq,
        .init_machine   = ams_delta_init,
        .timer          = &omap1_timer,
 +      .restart        = omap1_restart,
  MACHINE_END
- 
- EXPORT_SYMBOL(ams_delta_latch1_write);
- EXPORT_SYMBOL(ams_delta_latch2_write);

diff --cc drivers/leds/Kconfig
Simple merge

diff --cc drivers/leds/Makefile
Simple merge

diff --cc drivers/mtd/nand/ams-delta.c
Simple merge

diff --cc drivers/video/omap/lcd_ams_delta.c
Simple merge

diff --cc sound/soc/omap/ams-delta.c
Simple merge