git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a497b50
39f47d9
)
Merge branch 'devel-omap5' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Tue, 10 Jul 2012 07:45:25 +0000
(
00:45
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 10 Jul 2012 07:45:25 +0000
(
00:45
-0700)
Conflicts:
Documentation/devicetree/bindings/arm/omap/omap.txt
arch/arm/mach-omap2/Makefile
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff