Merge branch 'omap-all' into devel
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:42 +0000 (22:24 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 14 Oct 2008 21:24:42 +0000 (22:24 +0100)
commitb6825d2df55aa7d7341c715b577b73a6a03dc944
treeae4f0f52f4c2ad4e501dd323318486ccdd7fcd93
parent6defd90433729c2d795865165cb34d938d8ff07c
parentaa59e19d05114f9fb7718d6bc8398255476fb4f5
Merge branch 'omap-all' into devel

Conflicts:

arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/irq.c
21 files changed:
arch/arm/Makefile
arch/arm/mach-omap1/clock.c
arch/arm/mach-omap1/devices.c
arch/arm/mach-omap1/serial.c
arch/arm/mach-omap2/clock.c
arch/arm/mach-omap2/clock34xx.c
arch/arm/mach-omap2/devices.c
arch/arm/mach-omap2/gpmc.c
arch/arm/mach-omap2/id.c
arch/arm/mach-omap2/io.c
arch/arm/mach-omap2/memory.c
arch/arm/mach-omap2/mux.c
arch/arm/mach-omap2/serial.c
arch/arm/mm/Kconfig
arch/arm/plat-omap/common.c
arch/arm/plat-omap/devices.c
arch/arm/plat-omap/dmtimer.c
arch/arm/plat-omap/gpio.c
arch/arm/plat-omap/include/mach/gpio.h
arch/arm/plat-omap/include/mach/irqs.h
arch/arm/plat-omap/sram.c