git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c3e00a0
3bdc348
)
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
author
Olof Johansson
<olof@lixom.net>
Sun, 18 Dec 2011 04:05:50 +0000
(20:05 -0800)
committer
Olof Johansson
<olof@lixom.net>
Sun, 18 Dec 2011 04:05:50 +0000
(20:05 -0800)
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff