tree 69a7ecac041f83b0299f55a760f4f0cd5767ae05
parent 65af7c4608f7b7019e2faa220fb9624988965873
parent 76525ec214449318f793ff05fa5b0ecd0afe41cd
author Arnd Bergmann <arnd@arndb.de> 1320100943 +0100
committer Arnd Bergmann <arnd@arndb.de> 1320100943 +0100

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>