alistair23-linux/arch/arm/plat-omap
Tony Lindgren 43231b5be6 Merge commit '7185684' into omap-for-v3.10/timer
Conflicts:
	arch/arm/plat-omap/dmtimer.c

Resolve merge conflict in omap_device.c as per
Lothar Waßmann <LW@KARO-electronics.de>.
2013-04-03 10:32:47 -07:00
..
include/plat arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
counter_32k.c ARM: OMAP: 32k counter: resolve sparse warnings 2012-12-28 02:09:01 -07:00
debug-leds.c ARM: OMAP: debug-leds: Use resource_size instead of hard coded macro 2012-11-12 13:28:28 -08:00
dma.c ARM: OMAP: Fix the use of uninitialized dma_lch_count 2013-02-01 14:39:54 -08:00
dmtimer.c Merge commit '7185684' into omap-for-v3.10/timer 2013-04-03 10:32:47 -07:00
i2c.c ARM: OMAP: Fix i2c cmdline initcall for multiplatform 2013-01-11 11:24:19 -08:00
Kconfig arm-soc: late OMAP changes 2013-02-28 20:00:40 -08:00
mailbox.c workqueue: deprecate flush[_delayed]_work_sync() 2012-08-20 14:51:24 -07:00
Makefile ARM: OMAP2+: Enable ARCH_MULTIPLATFORM support 2013-01-11 11:24:20 -08:00
sram.c ARM: OMAP: SRAM: resolve sparse warnings 2013-01-01 15:42:00 -07:00