git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0d7614f
9fc31dd
)
Merge branch 'cleanup' into for-linus
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000
(23:01 +0100)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Thu, 4 Oct 2012 22:01:28 +0000
(23:01 +0100)
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Trivial merge