git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
296f3f2
07961ac
)
Merge commit 'v3.9-rc5' into next/clk-exynos
author
Kukjin Kim
<kgene.kim@samsung.com>
Mon, 8 Apr 2013 16:10:13 +0000
(
01:10
+0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Mon, 8 Apr 2013 16:10:13 +0000
(
01:10
+0900)
Conflicts:
arch/arm/boot/dts/exynos4.dtsi
arch/arm/boot/dts/exynos5440.dtsi
Trivial merge