git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a5f17d1
8c3d7c3
)
Merge branch 'topic/cleanup-s3c24xx' into next/cleanup-s3c24xx
author
Kukjin Kim
<kgene.kim@samsung.com>
Fri, 2 Mar 2012 23:57:03 +0000
(08:57 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Wed, 7 Mar 2012 09:36:33 +0000
(
01:36
-0800)
Conflicts:
arch/arm/mach-s3c24xx/include/mach/system.h
Trivial merge