git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9418c65
ac0f6f9
)
Merge with mainline to remove plat-omap/Kconfig conflict
author
Tony Lindgren
<tony@atomide.com>
Mon, 1 Mar 2010 22:19:05 +0000
(14:19 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Mon, 1 Mar 2010 22:19:05 +0000
(14:19 -0800)
Conflicts:
arch/arm/plat-omap/Kconfig
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff