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

..

board-cpuimx51.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-cpuimx51sd.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-mx50_rdp.c

ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER

2011-09-26 11:40:36 +02:00

board-mx51_3ds.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-mx51_babbage.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-mx51_efikamx.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-mx51_efikasb.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-mx53_ard.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

board-mx53_evk.c

ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER

2011-09-26 11:40:36 +02:00

board-mx53_loco.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

board-mx53_smd.c

ARM i.MX boards: use CONFIG_MULTI_IRQ_HANDLER

2011-09-26 11:40:36 +02:00

clock-mx51-mx53.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

cpu_op-mx51.c

cpufreq for freescale mx51

2010-10-22 08:24:14 +02:00

cpu_op-mx51.h

cpufreq for freescale mx51

2010-10-22 08:24:14 +02:00

cpu.c

ARM: mx5: use generic function for displaying silicon revision

2011-08-26 08:51:00 +02:00

crm_regs.h

ARM: mx53: Add support for missing UARTs

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

devices-imx50.h

ARM: imx: clean up the section marks of extern data

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

devices-imx51.h

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

devices-imx53.h

ARM: imx: Define functions for registering PATA

2011-08-24 18:13:34 +02:00

efika.h

efikamx: add usb h1 support

2011-02-18 10:56:38 +01:00

ehci.c

ARM: mx5: dynamically allocate mxc-ehci devices

2011-08-01 11:16:55 +02:00

eukrea_mbimx51-baseboard.c

Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd

2011-08-26 10:09:31 +02:00

eukrea_mbimxsd-baseboard.c

Merge branches 'cleanups/assorted', 'cleanups/shawn-cleanup-mxc-gpio', 'cleanups/troy-cleanup-iomux-v3' and 'cleanups/ukl-mx5-dynamically-allocate-devices' into imx-cleanups-for-arnd

2011-08-26 10:09:31 +02:00

Kconfig

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

Makefile

Merge branches 'cleanups/assorted' and 'cleanups/mm-tzic' into imx-cleanup

2011-09-20 10:09:08 +02:00

Makefile.boot

ARM i.MX53: Make MX53 EVK bootable

2011-01-04 12:00:23 +01:00

mm.c

Merge branches 'cleanups/mx3-mm-v2' and 'cleanups/mxs' into imx-cleanup

2011-10-04 10:55:53 +02:00

mx51_efika.c

Merge branch 'imx/cleanup' into imx/devel

2011-10-07 21:57:31 +02:00

pm-imx5.c

ARM: mx5: fix clock usage for suspend

2011-10-07 21:42:44 +02:00

system.c

arm/imx: remove cpu_is_xxx() from arch_idle()

2011-10-04 10:55:06 +02:00