git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
abba63e
0005ae7
)
Merge branch 'devel-hsmmc' into for-next
author
Tony Lindgren
<tony@atomide.com>
Tue, 1 Mar 2011 22:50:51 +0000
(14:50 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 1 Mar 2011 22:50:51 +0000
(14:50 -0800)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff