diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 22:56:56 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-11-21 22:56:56 +0100 |
| commit | 2d13ccaa8797d7e599f3792aed4b1e44b47f94a5 (patch) | |
| tree | 7079c1610373fc6709c3a285a53099beaf21295a /sound/soc/codecs/wm9081.c | |
| parent | Merge branch 'restart-cleanup' into restart (diff) | |
| parent | ARM: VIC: remove non MULTI_IRQ_HANDLER support (diff) | |
| download | linux-2d13ccaa8797d7e599f3792aed4b1e44b47f94a5.tar.xz linux-2d13ccaa8797d7e599f3792aed4b1e44b47f94a5.zip | |
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.
Diffstat (limited to 'sound/soc/codecs/wm9081.c')
0 files changed, 0 insertions, 0 deletions