git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
13358ff
994c0e9
)
Merge branch 'linus' into cbus
author
Tony Lindgren
<tony@atomide.com>
Thu, 3 Nov 2011 00:31:14 +0000
(17:31 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 3 Nov 2011 00:31:14 +0000
(17:31 -0700)
Conflicts:
arch/arm/mach-omap1/board-nokia770.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff