git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d5663e7
2213d0c
)
Merge branch 'next/topic-dma-pl330-devname-fix' into next/topic-dma-samsung
author
Kukjin Kim
<kgene.kim@samsung.com>
Mon, 19 Sep 2011 01:30:49 +0000
(10:30 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Mon, 19 Sep 2011 01:30:49 +0000
(10:30 +0900)
Conflicts:
arch/arm/mach-exynos4/clock.c
arch/arm/mach-s5p64x0/clock-s5p6440.c
arch/arm/mach-s5p64x0/clock-s5p6450.c
arch/arm/mach-s5pc100/clock.c
arch/arm/mach-s5pv210/clock.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff