]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'stericsson/cleanup' into next/timer
authorArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:42:23 +0000 (23:42 +0100)
committerArnd Bergmann <arnd@arndb.de>
Mon, 31 Oct 2011 22:42:23 +0000 (23:42 +0100)
commit7a1059589cf865dd3e66200a645900618162b3a4
tree69a7ecac041f83b0299f55a760f4f0cd5767ae05
parent45dff6e0c8d64c208ad0a44f3db2b348c89615a9
parentc5dbee1f20ff5721028ad7fc916347a25a1eee9b
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>
arch/arm/mach-ux500/Makefile
arch/arm/mach-ux500/cpu.c