git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a94d236
f31c2f1
)
Merge branch 'late/clksrc' into late/cleanup
author
Arnd Bergmann
<arnd@arndb.de>
Mon, 6 May 2013 21:43:45 +0000
(23:43 +0200)
committer
Arnd Bergmann
<arnd@arndb.de>
Mon, 6 May 2013 21:43:45 +0000
(23:43 +0200)
There is no reason to keep the clksrc cleanups separate from the
other cleanups, and this resolves some merge conflicts.
Conflicts:
arch/arm/mach-spear/spear13xx.c
drivers/irqchip/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff