git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
94a06b7
a08572a
)
Merge branch 'integration-2.6.39-for-tony' of git://git.pwsan.com/linux-integration...
author
Tony Lindgren
<tony@atomide.com>
Fri, 11 Mar 2011 17:20:03 +0000
(09:20 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Fri, 11 Mar 2011 17:20:03 +0000
(09:20 -0800)
Conflicts:
arch/arm/mach-omap2/pm34xx.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff