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
clock.h
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
irq-pxa168.c
jasper.c	ARM: restart: mmp: use new restart hook	2012-01-05 12:57:15 +00:00
Kconfig
Makefile
Makefile.boot
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
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