git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
eed1e57
)
Merge branch 'stericsson/cleanup' into next/timer
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:42:23 +0000
(23:42 +0100)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 31 Oct 2011 22:42:23 +0000
(23:42 +0100)
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>
No differences found
git.openpandora.org / pandora-kernel.git / commitdiff