Arnd Bergmann a07613a54d Merge branch 'samsung/dt' into samsung/cleanup ... Conflicts: arch/arm/mach-s3c64xx/Makefile arch/arm/mach-s5pc100/Makefile arch/arm/mach-s5pv210/Makefile Pull in previously resolved conflicts: The Makefiles were reorganized in the "rmk/restart" series and modified in the "samsung/cleanup series". This also pulls in the other conflict resolutions from the restart series against the samsung/dt series. Signed-off-by: Arnd Bergmann <arnd@arndb.de>		2012-01-09 16:01:00 +00:00
..
crag6410.h	ARM: S3C64XX: Use module identification for Cragganmore system builds	2011-09-19 16:32:36 +09:00
debug-macro.S	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
dma.h	ARM: SAMSUNG: Remove Samsung specific enum type for dma direction	2011-09-14 11:10:04 +05:30
entry-macro.S	ARM: s3c64xx: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:03 +00:00
gpio.h	ARM: gpio: make trivial GPIOLIB implementation the default	2011-08-12 08:54:19 +01:00
hardware.h
io.h	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00
irqs.h	ARM: SAMSUNG: Remove uart irq handling from plaform code	2011-08-23 10:48:31 -07:00
map.h	ARM: S3C64XX: Modified files for SPI consolidation work	2011-12-23 10:50:00 +09:00
pm-core.h	ARM: SAMSUNG: Update the name of regarding Samsung GPIO	2011-09-21 15:07:04 +09:00
regs-clock.h	ARM: S3C64XX: Add support for Compact Flash driver on SMDK6410	2010-08-05 18:32:50 +09:00
regs-gpio-memport.h
regs-gpio.h
regs-irq.h
regs-modem.h
regs-srom.h
regs-sys.h	ARM: S3C64XX: Add support for synchronous clock operation	2011-09-19 16:38:11 +09:00
regs-syscon-power.h
spi-clocks.h	ARM: S3C64XX: Move device and device setup into mach-s3c64xx	2010-02-20 22:32:01 +00:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
tick.h
timex.h	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00
uncompress.h