Arnd Bergmann eed1e57650 Merge branch 'stericsson/cleanup' into next/timer ... The timer and cleanup branches from stericsson conflict, so I'm merging them here. Conflicts: arch/arm/mach-ux500/Makefile arch/arm/mach-ux500/cpu.c Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-10-31 23:42:23 +01:00
..
include/plat	Merge branch 'stericsson/cleanup' into next/timer	2011-10-31 23:42:23 +01:00
Kconfig	ARM: plat-nomadik: MTU sched_clock as an option	2011-09-22 15:42:33 +02:00
Makefile	gpio: move Nomadik GPIO driver to drivers/gpio	2011-05-26 17:30:03 -06:00
timer.c	ARM: plat-nomadik: timer: Export reset functions	2011-09-22 15:44:17 +02:00