Arnd Bergmann 08cab72f91 Merge branch 'dt/gic' into next/dt ... Conflicts: arch/arm/include/asm/localtimer.h arch/arm/mach-msm/board-msm8x60.c arch/arm/mach-omap2/board-generic.c		2011-10-31 14:08:10 +01:00
..
devices	dmaengine: imx-sdma: use platform_device_id to identify sdma version	2011-07-27 09:31:45 +08:00
include/mach	Merge branch 'dt/gic' into next/dt	2011-10-31 14:08:10 +01:00
3ds_debugboard.c
audmux-v1.c
audmux-v2.c
avic.c	ARM i.MX avic: do not depend on MXC_INTERNAL_IRQS	2011-07-07 10:00:00 +02:00
clock.c
cpu.c
cpufreq.c
devices.c	ARM: mxc: clean up imx-dma device registration	2011-07-07 10:01:12 +02:00
epit.c
iomux-v1.c
iomux-v3.c
iram_alloc.c
irq-common.c	ARM: mxc: convert tzic to use generic irq chip	2011-07-07 10:01:07 +02:00
irq-common.h
Kconfig
Makefile
pwm.c	plat-mxc/pwm.c: use resource_size()	2011-07-07 10:00:01 +02:00
ssi-fiq-ksym.c
ssi-fiq.S
system.c
time.c
tzic.c	ARM: mxc: convert tzic to use generic irq chip	2011-07-07 10:01:07 +02:00
ulpi.c