git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6cd811a
a9daa37
)
Merge branch 'fixes' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Tue, 17 Apr 2012 21:07:32 +0000
(14:07 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 17 Apr 2012 21:07:32 +0000
(14:07 -0700)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff