linux

mirror of https://github.com/FEX-Emu/linux.git synced 2025-01-16 14:38:49 +00:00

History

Russell King 2d13ccaa87 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.

2011-11-21 21:56:56 +00:00

include/mach

Merge branch 'irqchip-consolidation' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into devel-stable

2011-11-21 21:56:56 +00:00

adssphere.c

ARM: ep93xx: convert to MULTI_IRQ_HANDLER

2011-11-15 18:14:03 +00:00

clock.c

…

core.c

arm: Add export.h to ARM specific files as required.

2011-10-31 19:30:50 -04:00