git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ad145e0
7cab871
)
Merge branch 'omap-for-linus' into cbus
author
Tony Lindgren
<tony@atomide.com>
Thu, 24 Feb 2011 23:20:57 +0000
(15:20 -0800)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 24 Feb 2011 23:20:57 +0000
(15:20 -0800)
Conflicts:
arch/arm/plat-omap/include/plat/irqs.h
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff