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
..
debug-macro.S	…
dma.h	…
entry-macro.S	ARM: samsung: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +00:00
gpio.h	…
hardware.h	…
i2c.h	…
io.h	…
irqs.h	ARM: SAMSUNG: Move timer irq numbers to end of linux irq space	2011-12-23 10:04:39 +09:00
map.h	ARM: S5P64X0: Modified files for SPI consolidation work	2011-12-23 10:50:02 +09:00
pm-core.h	…
regs-clock.h	…
regs-gpio.h	…
regs-irq.h	…
s5p64x0-clock.h	…
spi-clocks.h	…
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
tick.h	…
timex.h	…
uncompress.h	…