git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
83b5938
d405e4b
)
Merge branch 'tegra/soc' into next/cleanup2
author
Olof Johansson
<olof@lixom.net>
Wed, 28 Mar 2012 00:19:15 +0000
(17:19 -0700)
committer
Olof Johansson
<olof@lixom.net>
Wed, 28 Mar 2012 00:19:15 +0000
(17:19 -0700)
Conflicts:
arch/arm/mach-tegra/Makefile
Signed-off-by: Olof Johansson <olof@lixom.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff