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

arm: mach-mxs: add device for rtc

2011-08-23 08:56:15 +02:00

include/mach

Merge branch 'imx/cleanup' into imx/devel

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

clock-mx23.c

mx23: register clocks for mmc

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

clock-mx28.c

ARM: mxs: correct the using of frac div for saif

2011-08-23 08:56:14 +02:00

clock.c

ARM i.MX23/28: remove secondary field from struct clk. It's unused

2011-01-24 09:01:48 +01:00

devices-mx23.h

arm: mach-mxs: add device for rtc

2011-08-23 08:56:15 +02:00

devices-mx28.h

arm: mach-mxs: add device for rtc

2011-08-23 08:56:15 +02:00

devices.c

gpio/mxs: Change gpio-mxs into an upstanding gpio driver

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

icoll.c

arm: Fold irq_set_chip/irq_set_handler

2011-03-29 14:47:58 +02:00

iomux.c

ARM: mxs: Add iomux support

2010-12-20 17:29:58 +01:00

Kconfig

arm: mach-mxs: add rtc to all boards

2011-08-23 08:56:15 +02:00

mach-mx23evk.c

Merge branch 'imx/cleanup' into imx/devel

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

mach-mx28evk.c

Merge branch 'imx/cleanup' into imx/devel

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

mach-stmp378x_devb.c

Merge branch 'imx/cleanup' into imx/devel

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

mach-tx28.c

arm: mach-mxs: add rtc to all boards

2011-08-23 08:56:15 +02:00

Makefile

ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file

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

Makefile.boot

ARM: mxs: Add build configuration for mxs

2010-12-20 17:30:44 +01:00

mm.c

ARM: mxs: Consolidate mm-mx23.c and mm-mx28.c into a single file

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

module-tx28.c

ARM: mxs: configure and register the second FEC device on TX28/STK5-V4

2011-03-23 15:08:14 +01:00

module-tx28.h

ARM: mxs: configure and register the second FEC device on TX28/STK5-V4

2011-03-23 15:08:14 +01:00

ocotp.c

arm: mxs: include asm/processor.h for cpu_relax()

2011-06-06 09:50:04 +02:00

pm.c

ARM: mxs: add initial pm support

2011-01-26 08:30:49 +01:00

regs-clkctrl-mx23.h

ARM i.MX23: remove reserved register defines

2011-01-28 08:28:52 +01:00

regs-clkctrl-mx28.h

ARM i.MX28: remove reserved register defines

2011-01-28 08:28:57 +01:00

system.c

ARM: mxs: Add missing EXPORT_SYMBOL for mxs_reset_block

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

timer.c

clocksource: convert MXS timrotv2 to 32-bit down counting clocksource

2011-05-23 18:04:52 +01:00