projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 65af7c4 76525ec)
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)
commiteed1e576507b52e03e549e0c9e0c747978122403
tree69a7ecac041f83b0299f55a760f4f0cd5767ae05tree | snapshot (tar.gz zip)
parent65af7c4608f7b7019e2faa220fb9624988965873commit | diff
parent76525ec214449318f793ff05fa5b0ecd0afe41cdcommit | diff
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 diff1 | diff2 | blob | history
arch/arm/mach-ux500/cpu.c diff1 | diff2 | blob | history
Motorola kernel-slsi