Arnd Bergmann cff9f37a1e Merge branch 'omap/cleanup-prcm-part2' into next/dt ...

This resolves a nontrivial conflict where the omap_prcm_restart
is removed in one branch but another use is added in another
branch.

Conflicts:
	arch/arm/mach-omap2/cm33xx.c
	arch/arm/mach-omap2/io.c
	arch/arm/mach-omap2/prm_common.c

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-11-15 17:59:54 +01:00

..

include

Merge branch 'omap/cleanup-prcm-part2' into next/dt

2012-11-15 17:59:54 +01:00

counter_32k.c

ARM: OMAP: Remove plat-omap/common.h

2012-10-31 15:37:13 -07:00

debug-devices.c

ARM: OMAP: Remove unnecessary mach and plat includes

2012-11-02 12:00:36 -07:00

debug-leds.c

ARM: OMAP: Fix relative includes for fpga.h

2012-10-31 15:37:14 -07:00

dma.c

ARM: OMAP: Remove cpu_is_omap usage from plat-omap/dma.c

2012-10-31 15:37:13 -07:00

dmtimer.c

Merge branch 'omap-for-v3.8/cleanup-headers-prepare-multiplatform-v3' into omap-for-v3.8/dt

2012-11-09 14:54:17 -08:00

fb.c

ARM: OMAP: Remove unnecessary mach and plat includes

2012-11-02 12:00:36 -07:00

i2c.c

ARM: OMAP: Remove unnecessary mach and plat includes

2012-11-02 12:00:36 -07:00

Kconfig

ARM: OMAP2+: Fix location of select PINCTRL

2012-10-22 13:37:34 -07:00

mailbox.c

workqueue: deprecate flush[_delayed]_work_sync()

2012-08-20 14:51:24 -07:00

Makefile

ARM: OMAP: Remove omap_init_consistent_dma_size()

2012-11-06 16:01:19 -08:00

sram.c

ARM: OMAP: Move omap2+ specific parts of sram.c to mach-omap2

2012-10-31 10:14:14 -07:00