git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b2f1df8
ed1b4ac
)
Merge branch 'tegra/cleanups' into next/timer
author
Arnd Bergmann
<arnd@arndb.de>
Wed, 21 Mar 2012 14:27:34 +0000
(14:27 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Wed, 21 Mar 2012 14:27:34 +0000
(14:27 +0000)
Conflicts:
arch/arm/mach-tegra/Makefile
arch/arm/mach-vexpress/core.h
The tegra Makefile was changed in four different branches
in the same line. This merge should reduce the amount
of churn.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff