git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d02643
7bd3b61
)
Merge branch 'omap-for-v3.8/cleanup-headers-menelaus' into omap-for-v3.8/cleanup...
author
Tony Lindgren
<tony@atomide.com>
Thu, 25 Oct 2012 19:21:48 +0000
(12:21 -0700)
committer
Tony Lindgren
<tony@atomide.com>
Thu, 25 Oct 2012 19:21:48 +0000
(12:21 -0700)
Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n8x0.c
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff