git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
1d32860
80d9375
)
Merge branch 'for-3.9/scu-base-rework' into for-3.9/soc-t114
author
Stephen Warren
<swarren@nvidia.com>
Mon, 28 Jan 2013 18:22:46 +0000
(11:22 -0700)
committer
Stephen Warren
<swarren@nvidia.com>
Mon, 28 Jan 2013 18:22:46 +0000
(11:22 -0700)
Conflicts:
arch/arm/mach-tegra/platsmp.c
Trivial merge