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: S5P64X0: 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
i2c.h	ARM: S5P64X0: Add S5P6450 I2C support	2010-10-18 18:33:03 +09:00
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	ARM: S5P64X0: Add Power Management support	2011-10-04 20:31:24 +09:00
regs-clock.h	ARM: S5P64X0: Add Power Management support	2011-10-04 20:31:24 +09:00
regs-gpio.h	ARM: S5P64X0: Add Power Management support	2011-10-04 20:31:24 +09:00
regs-irq.h	ARM: S5P64X0: Update IRQ support	2010-10-18 18:33:03 +09:00
s5p64x0-clock.h
spi-clocks.h	ARM: S5P64X0: Update Audio support	2010-10-18 18:33:03 +09:00
system.h	ARM: restart: remove the now empty arch_reset()	2012-01-05 12:57:22 +00:00
tick.h	ARM: S5P64X0: Update Timer support	2010-10-18 18:33:03 +09:00
timex.h
uncompress.h	ARM: zImage: remove the static qualifier from global data variables	2011-05-07 00:08:02 -04:00