Arnd Bergmann 526b264163 Merge branch 'imx/cleanup' into imx/devel ... This helps resolve the conflicts between the imx cleanups and the new code that has gone into the imx tree. Conflict resolution was originally done by Sascha Hauer. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2011-10-07 21:57:31 +02:00
..
devices	Merge branch 'imx/cleanup' into imx/devel	2011-10-07 21:57:31 +02:00
include/mach	Merge branch 'imx/cleanup' into imx/devel	2011-10-07 21:57:31 +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 i.MX audmux v2: remove unnecessary ifdefs	2011-08-26 10:02:28 +02:00
avic.c	Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features	2011-09-29 10:40:29 +02: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	ARM: mxc: drop now unused function mxc_register_device	2011-08-01 11:54:19 +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 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 i.MX: allow to compile together all i.MX5 based SoCs	2011-08-24 09:24:50 +02:00
Makefile	gpio/mxc: Move Freescale MXC gpio driver to drivers/gpio	2011-06-06 10:01:19 -06: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/imx: remove cpu_is_xxx() check from __imx_ioremap()	2011-10-04 10:55:12 +02:00
time.c	Merge branch 'devel-stable' into for-linus	2011-05-23 19:28:04 +01:00
tzic.c	Merge branches 'features/assorted', 'features/imx-pata' and 'features/imx-multi-irq-v2' into imx-features	2011-09-29 10:40:29 +02:00
ulpi.c	ARM i.MX: introduce imx_otg_ulpi_create to create ULPI transceivers	2011-03-07 19:29:41 +01:00