git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
d74ade1
53afbee
)
Merge branch 'testing-misc' into dt-merge
author
Tony Lindgren
<tony@atomide.com>
Tue, 4 Oct 2011 00:01:39 +0000
(17:01 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Tue, 4 Oct 2011 00:01:39 +0000
(17:01 -0700)
Conflicts:
arch/arm/mach-omap2/board-generic.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff