git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9335e91
bdc93a7
)
Merge branch 'for-3.4/soc-drivers' into for-3.4/t30-smp
author
Olof Johansson
<olof@lixom.net>
Sun, 26 Feb 2012 22:43:43 +0000
(14:43 -0800)
committer
Olof Johansson
<olof@lixom.net>
Sun, 26 Feb 2012 22:43:43 +0000
(14:43 -0800)
Conflicts:
arch/arm/mach-tegra/Makefile
Trivial merge