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
..
devices	Merge branch 'next/driver' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:16:43 -07:00
include/mach	ARM: imx: convert smp platforms to global gic_handle_irq()	2011-11-15 18:13:59 +00:00
3ds_debugboard.c	arm: Fold irq_set_chip/irq_set_handler	2011-03-29 14:47:58 +02:00
audmux-v1.c	ARM: mxc: remove paragraphs with old address of the FSF	2010-06-30 09:00:28 +02:00
audmux-v2.c	ARM i.MX audmux v2: remove unnecessary ifdefs	2011-08-26 10:02:28 +02:00
avic.c	ARM:i.MX: fix build error in tzic/avic.c	2011-11-04 03:54:17 +08:00
clock.c	arm: mxc: utilise usecount field in clock operations	2010-07-26 14:17:57 +02:00
cpu.c	ARM: imx: Introduce generic function for displaying silicon revision	2011-08-26 08:50:58 +02:00
cpufreq.c	treewide: cleanup continuations and remove logging message whitespace	2011-04-26 10:24:37 +02:00
devices.c	Merge branch 'next/cleanup' of git://git.linaro.org/people/arnd/arm-soc	2011-11-01 20:11:00 -07:00
epit.c	clocksource: convert ARM 32-bit down counting clocksources	2011-05-23 18:04:51 +01:00
iomux-v1.c	ARM: mxc: iomux-v1: Fix build warning	2011-07-07 09:07:33 +02:00
iomux-v3.c	MXC IOMUX-V3 replace struct pad_desc with bitmapped cookie (step 2)	2010-12-15 12:42:49 +01:00
iram_alloc.c	ARM: imx: Add iram allocator functions	2010-10-19 18:44:57 +02:00
irq-common.c	ARM i.MX avic: convert to use generic irq chip	2011-09-23 08:32:14 +02:00
irq-common.h	ARM i.MX avic: convert to use generic irq chip	2011-09-23 08:32:14 +02:00
Kconfig	arm/imx: fix AUTO_ZRELADDR selection	2011-11-11 16:53:34 +01:00
Makefile	ARM: imx: convert smp platforms to global gic_handle_irq()	2011-11-15 18:13:59 +00:00
pwm.c	ARM: imx: pwm: Add support for MX53	2011-08-24 10:10:41 +02:00
ssi-fiq-ksym.c	ASoC: Add a new imx-ssi sound driver	2010-01-17 11:09:46 +00:00
ssi-fiq.S	ARM: mxc: Correct data alignment in headsmp.S for CONFIG_THUMB2_KERNEL	2011-04-12 09:48:10 +02:00
system.c	ARM: restart: only perform setup for restart when soft-restarting	2011-11-21 09:47:48 +00:00
time.c	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
tzic.c	ARM:i.MX: fix build error in tzic/avic.c	2011-11-04 03:54:17 +08:00
ulpi.c	ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers	2011-03-07 19:29:41 +01:00