git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6bea0d9
ae5bdd3
)
Merge branch 'for_3.2/3_omap_devicetree' of git://gitorious.org/omap-pm/linux into dt
author
Tony Lindgren
<tony@atomide.com>
Mon, 3 Oct 2011 23:38:55 +0000
(16:38 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 3 Oct 2011 23:38:55 +0000
(16:38 -0700)
Conflicts:
arch/arm/mach-omap2/omap_l3_noc.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff