git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d44f42e
3d3635c
0a179ea
7039154
868c157
)
Merge branches 'clock_cleanup_misc_3.6', 'control_clean_dspbridge_writes_cleanup_3...
author
Paul Walmsley
<paul@pwsan.com>
Thu, 21 Jun 2012 02:11:36 +0000
(20:11 -0600)
committer
Paul Walmsley
<paul@pwsan.com>
Thu, 21 Jun 2012 02:11:36 +0000
(20:11 -0600)
Conflicts:
arch/arm/mach-omap2/omap_hwmod.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff