git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
12d7d4e
d594f1f
b176654
0a0d128
0005ae7
)
Merge branches 'devel-iommu-mailbox', 'devel-mcbsp', 'devel-board' and 'devel-hsmmc...
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 01:11:18 +0000
(17:11 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Mar 2011 01:11:18 +0000
(17:11 -0800)
Conflicts:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff