git.openpandora.org
/
pandora-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
59136ef
11f1c5d
)
Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel...
author
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 21 Nov 2011 21:56:56 +0000
(21:56 +0000)
committer
Russell King
<rmk+kernel@arm.linux.org.uk>
Mon, 21 Nov 2011 21:56:56 +0000
(21:56 +0000)
Conflicts:
arch/arm/mach-omap2/board-4430sdp.c
arch/arm/mach-omap2/board-omap4panda.c
arch/arm/mach-omap2/include/mach/omap4-common.h
arch/arm/plat-omap/include/plat/irqs.h
The changes to omap4-common.h were moved to arch/arm/mach-omap2/common.h
and the other trivial conflicts resolved. The now empty ifdef in irqs.h
was also eliminated.
Trivial merge
git.openpandora.org / pandora-kernel.git / commitdiff