git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e1d62c9
257d643
)
Merge branch '4460' into tmp-merge
author
Tony Lindgren
<tony@atomide.com>
Mon, 11 Jul 2011 11:20:51 +0000
(
04:20
-0700)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 11 Jul 2011 11:20:51 +0000
(
04:20
-0700)
Conflicts:
arch/arm/mach-omap2/cm-regbits-44xx.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff