]> 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)
commit2fafcdb2dc77da56798e4859fbffffd8c569d3a8
tree69a7ecac041f83b0299f55a760f4f0cd5767ae05
parente9fe770a0bbb3c20345f0fa3f395c8d33b41bdc0
parent0b979ef8c0bf3714dd4e7b6dd02c2658029da39d
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