git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b40d9aa
19f3a98
)
Merge branch 'cleanup-hwmod' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Mon, 25 Jun 2012 14:55:17 +0000
(07:55 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 25 Jun 2012 14:55:17 +0000
(07:55 -0700)
Conflicts:
arch/arm/mach-omap2/dsp.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff