git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
365480d
7bd3b61
)
Merge branch 'depends/omap-cleanup-headers-menelaus' into next/headers
author
Olof Johansson
<olof@lixom.net>
Mon, 5 Nov 2012 18:28:21 +0000
(10:28 -0800)
committer
Olof Johansson
<olof@lixom.net>
Mon, 5 Nov 2012 18:28:21 +0000
(10:28 -0800)
Again, resolve conflicts identical to how Tony did.
Conflicts:
arch/arm/mach-omap2/board-h4.c
arch/arm/mach-omap2/board-n8x0.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff