git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a8e1ceb
6fd9b70
)
Merge branch 'next/dt2' into HEAD
author
Olof Johansson
<olof@lixom.net>
Mon, 1 Oct 2012 21:37:01 +0000
(14:37 -0700)
committer
Olof Johansson
<olof@lixom.net>
Mon, 1 Oct 2012 21:37:01 +0000
(14:37 -0700)
Conflicts:
arch/arm/mach-exynos/clock-exynos5.c
Trivial merge