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

..

include/mach

Merge branch 'samsung/driver' into next/drivers

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

aspenite.c

Merge branch 'samsung/driver' into next/drivers

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

avengers_lite.c

Merge branch 'samsung/driver' into next/drivers

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

brownstone.c

Merge branch 'samsung/driver' into next/drivers

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

clock.c

ARM: pxa: add clk_set_rate()

2011-07-12 19:45:19 +08:00

clock.h

ARM: pxa: use correct __iomem annotations

2011-10-08 21:03:07 +08:00

common.c

ARM: restart: mmp: use new restart hook

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

common.h

ARM: restart: mmp: use new restart hook

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

devices.c

…

flint.c

Merge branch 'samsung/driver' into next/drivers

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

gplugd.c

Merge branch 'samsung/driver' into next/drivers

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

irq-mmp2.c

arm: Cleanup the irq namespace

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

irq-pxa168.c

arm: Fold irq_set_chip/irq_set_handler

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

jasper.c

ARM: restart: mmp: use new restart hook

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

Kconfig

ARM: mmp: rename SHEEVAD to GPLUGD

2011-10-25 20:28:49 +08:00

Makefile

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

2011-11-05 18:21:21 -07:00

Makefile.boot

ARM: 7022/1: allow to detect conflicting zreladdrs

2011-10-17 09:12:40 +01:00

mmp2.c

ARM: pxa: add clk support in gpio driver

2011-11-15 19:09:36 +08:00

pxa168.c

Merge branch 'samsung/driver' into next/drivers

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

pxa910.c

ARM: pxa: add clk support in gpio driver

2011-11-15 19:09:36 +08:00

sram.c

ARM: mmp: add sram allocator

2011-10-25 20:29:20 +08:00

tavorevb.c

Merge branch 'samsung/driver' into next/drivers

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

teton_bga.c

Merge branch 'samsung/driver' into next/drivers

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

time.c

ARM: 7205/2: sched_clock: allow sched_clock to be selected at runtime

2011-12-18 23:00:26 +00:00

ttc_dkb.c

Merge branch 'samsung/driver' into next/drivers

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