git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
de1121f
72d3105
)
Merge current mainline tree into linux-omap tree
author
Tony Lindgren
<tony@atomide.com>
Mon, 22 Sep 2008 14:26:10 +0000
(17:26 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 22 Sep 2008 14:26:10 +0000
(17:26 +0300)
Merge branches 'master' and 'linus'
Conflicts:
arch/arm/plat-omap/devices.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff