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	ARM: add an extra temp register to the low level debugging addruart macro	2011-09-26 10:11:25 -04:00
dma.h	ARM: S5PC100: Use generic DMA PL330 driver	2011-09-14 11:10:03 +05:30
entry-macro.S	ARM: samsung: convert to MULTI_IRQ_HANDLER	2011-11-15 18:14:04 +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 plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx	2010-02-24 01:52:06 +00:00
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: S5PC100: Modified files for SPI consolidation work	2011-12-23 10:50:01 +09:00
regs-clock.h	ARM: S5PC100: Add support for Compact Flash driver on SMDKC100	2010-08-05 18:30:50 +09:00
regs-gpio.h	ARM: S5PC100: Cleanup the GPIOlib code	2010-10-25 16:02:15 +09:00
regs-irq.h	ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework	2010-05-20 15:28:32 +09:00
spi-clocks.h	ARM: S5PC100: Define SPI platform devices	2010-05-20 19:31:09 +09:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
tick.h	ARM: SAMSUNG: move S5PC100 support from plat-s5pc1xx to plat-s5p framework	2010-05-20 15:28:32 +09:00
timex.h	ARM: SAMSUNG: Move plat-s3c Kconfig entries to plat-samsung and plat-s3c24xx	2010-02-24 01:52:06 +00:00
uncompress.h