git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
5f61296
19f3a98
)
Merge branch 'cleanup-hwmod' into cleanup
omap-cleanup-for-v3.6
author
Tony Lindgren
<tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000
(
05:47
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 28 Jun 2012 12:47:01 +0000
(
05:47
-0700)
Conflicts:
arch/arm/mach-omap2/dsp.c
Trivial merge