git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a5f17d1
6d259a2
)
Merge branch 'topic/cleanup-use-static' into next/cleanup-use-static
author
Kukjin Kim
<kgene.kim@samsung.com>
Wed, 7 Mar 2012 11:34:41 +0000
(
03:34
-0800)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Wed, 7 Mar 2012 11:34:41 +0000
(
03:34
-0800)
Conflicts:
arch/arm/mach-exynos/dma.c
arch/arm/mach-s5p64x0/dma.c
arch/arm/mach-s5pc100/dma.c
arch/arm/mach-s5pv210/dma.c
Trivial merge