git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c2f1688
3b9b101
)
Merge branch 'omap-for-v3.11/cleanup' into omap-for-v3.11/tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Mon, 10 Jun 2013 03:46:44 +0000
(20:46 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 10 Jun 2013 03:46:44 +0000
(20:46 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_33xx_data.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff