git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1fc3eb8
e5570bb
)
Merge branch 'tegra/soc' into next/boards
author
Arnd Bergmann
<arnd@arndb.de>
Fri, 6 Jan 2012 23:09:14 +0000
(23:09 +0000)
committer
Arnd Bergmann
<arnd@arndb.de>
Fri, 6 Jan 2012 23:09:14 +0000
(23:09 +0000)
Conflicts:
arch/arm/mach-tegra/board-harmony-pcie.c
To fix an internal merge conflict between the tegra/soc and tegra/boards
branches.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff