git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bb75137
211ff15
)
Merge branch 'omap-upstream'
author
Tony Lindgren
<tony@atomide.com>
Wed, 12 Aug 2009 17:04:59 +0000
(20:04 +0300)
committer
Tony Lindgren
<tony@atomide.com>
Wed, 12 Aug 2009 17:04:59 +0000
(20:04 +0300)
Conflicts:
arch/arm/mach-omap2/Makefile
Trivial merge