git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5698bd7
011527b
fae9659
)
Merge branches 'next/pinctrl-samsung' and 'next/board-samsung' into next/dt-samsung-new
author
Kukjin Kim
<kgene.kim@samsung.com>
Sat, 22 Sep 2012 03:11:21 +0000
(12:11 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Sat, 22 Sep 2012 03:11:21 +0000
(12:11 +0900)
Conflicts:
arch/arm/mach-exynos/mach-smdkv310.c
Trivial merge