git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
593d7b2
c763e2f
)
Merge tomi/for-next
author
Tony Lindgren
<tony@atomide.com>
Wed, 9 Dec 2009 01:47:23 +0000
(17:47 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 9 Dec 2009 01:47:23 +0000
(17:47 -0800)
Merge remote branch 'tomi/for-next' into tmp-rebuild-
1260323192
Conflicts:
arch/arm/mach-omap2/io.c
Trivial merge