Arnd Bergmann dcf7ec5ee6 Merge branch 'samsung/driver' into next/drivers ...

Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

2012-01-09 16:16:29 +00:00

..

clock.h

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

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

common.h

Merge branch 'samsung/driver' into next/drivers

2012-01-09 16:16:29 +00:00

debug-macro.S

Merge branch 'next/cross-platform' of git://git.linaro.org/people/arnd/arm-soc

2011-11-01 20:34:22 -07:00

devices-common.h

ARM: mx28evk: add platform data for saif

2011-12-02 13:57:15 +08:00

digctl.h

ARM: mxs: add saif clkmux functions

2011-12-02 13:57:14 +08:00

dma.h

ARM: mxs-dma: include <linux/dmaengine.h>

2011-07-15 10:45:28 +02:00

entry-macro.S

ARM: mxs: Add interrupt support

2010-12-20 10:37:56 +01:00

gpio.h

Merge branch 'depends/rmk/gpio' into next/devel

2011-10-31 23:46:42 +01:00

hardware.h

…

io.h

ARM: mxs: Add helper definition and function

2010-12-13 14:49:50 +01:00

iomux-mx23.h

ARM: mxs: fix typo "GPO" in iomux-mx23.h

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

iomux-mx28.h

ARM: mxs: Add iomux support

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

iomux.h

ARM: mxs: add helper macro for pad control

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

irqs.h

…

mmc.h

mmc: mxs-mmc: add mmc host driver for i.MX23/28

2011-03-15 13:49:37 -04:00

mx23.h

ARM: mxs/i.MX23: make i2c defines consistent and match the reference manual

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

mx28.h

ARM: mx28: LRADC macro rename

2011-12-02 13:27:23 +08:00

mxs.h

arm: mx23: recognise stmp378x as mx23

2011-12-02 13:27:22 +08:00

mxsfb.h

video: Add i.MX23/28 framebuffer driver

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

system.h

ARM: restart: remove the now empty arch_reset()

2012-01-05 12:57:22 +00:00

timex.h

ARM: mxs: Add helper definition and function

2010-12-13 14:49:50 +01:00

uncompress.h

ARM: mxs: Add initial support for DENX MX28

2011-10-13 09:06:58 +02:00