| commit | 2d13ccaa8797d7e599f3792aed4b1e44b47f94a5 | [log] [tgz] |
|---|---|---|
| author | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Nov 21 21:56:56 2011 +0000 |
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | Mon Nov 21 21:56:56 2011 +0000 |
| tree | 7079c1610373fc6709c3a285a53099beaf21295a | |
| parent | 59136ef3c596606d3eef920dc3e0fdfa2ce52c6f [diff] | |
| parent | 11f1c5de7be06bbb51363002ebc4d00edc2677df [diff] |
Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable 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.