git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
604eefe
30fe764
)
Merge branch 'next-exynos4-pm' into for-next
author
Kukjin Kim
<kgene.kim@samsung.com>
Sat, 12 Mar 2011 01:20:07 +0000
(10:20 +0900)
committer
Kukjin Kim
<kgene.kim@samsung.com>
Sat, 12 Mar 2011 01:20:07 +0000
(10:20 +0900)
Conflicts:
arch/arm/mach-exynos4/include/mach/regs-pmu.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff