git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c9477f3
568f0e2
)
Merge branch 'next-samsung-devel' into next-samsung-devel-2
author
Kukjin Kim
<kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:18:36 +0000
(20:18 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Tue, 4 Oct 2011 11:18:36 +0000
(20:18 +0900)
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s3c2412/gpio.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5p64x0/gpiolib.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff