git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f6f1f12
472fd54
)
Merge branch 'cleanup' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Fri, 29 Jun 2012 14:28:24 +0000
(07:28 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 29 Jun 2012 14:28:24 +0000
(07:28 -0700)
Conflicts:
arch/arm/mach-omap2/clockdomains3xxx_data.c
Trivial merge