Arnd Bergmann a32750c2ca Merge branches 'imx/pata' and 'imx/sata' into next/driver ...

Conflicts:
	arch/arm/mach-mx5/clock-mx51-mx53.c
	arch/arm/mach-mx5/devices-imx53.h

2011-10-20 15:17:34 +02:00

..

devices

Merge branches 'imx/pata' and 'imx/sata' into next/driver

2011-10-20 15:17:34 +02:00

include/mach

Merge branches 'imx/pata' and 'imx/sata' into next/driver

2011-10-20 15:17:34 +02: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: imx: use SOC_IMX25 instead of ARCH_MX25 for multi-SoC

2010-11-19 21:54:34 +01:00

avic.c

ARM i.MX avic: do not depend on MXC_INTERNAL_IRQS

2011-07-07 10:00:00 +02:00

clock.c

arm: mxc: utilise usecount field in clock operations

2010-07-26 14:17:57 +02:00

cpu.c

[ARM] MXC: add cpu_is_ macros

2009-03-13 10:34:26 +01:00

cpufreq.c

treewide: cleanup continuations and remove logging message whitespace

2011-04-26 10:24:37 +02:00

devices.c

ARM: mxc: clean up imx-dma device registration

2011-07-07 10:01:12 +02: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: mxc: convert tzic to use generic irq chip

2011-07-07 10:01:07 +02:00

irq-common.h

mx51: support FIQ on TZIC, revised

2010-12-14 09:54:37 +01:00

Kconfig

ARM: imx: move mx3 support to mach-imx

2011-05-19 13:11:38 +02:00

Makefile

gpio/mxc: Move Freescale MXC gpio driver to drivers/gpio

2011-06-06 10:01:19 -06:00

pwm.c

plat-mxc/pwm.c: use resource_size()

2011-07-07 10:00:01 +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: remove support for mxc91231

2011-05-19 13:11:28 +02:00

time.c

Merge branch 'devel-stable' into for-linus

2011-05-23 19:28:04 +01:00

tzic.c

ARM: mxc: convert tzic to use generic irq chip

2011-07-07 10:01:07 +02:00

ulpi.c

ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers

2011-03-07 19:29:41 +01:00