Ben Dooks 6aeaad51aa ARM: Merge for-2635-4/watchdog ... Merge branch 'for-2635-4/watchdog' into for-2635-4/partial2 Conflicts: arch/arm/mach-s3c64xx/mach-smdk6410.c arch/arm/mach-s5p6440/Kconfig arch/arm/mach-s5p6440/include/mach/map.h arch/arm/mach-s5p6440/mach-smdk6440.c arch/arm/mach-s5pv210/Kconfig arch/arm/mach-s5pv210/include/mach/map.h arch/arm/mach-s5pv210/mach-smdkv210.c		2010-05-20 19:51:40 +09:00
..
debug-macro.S	ARM: SAMSUNG: Fixup commit 4e6d488af3	2010-03-15 23:11:41 +00:00
dma.h	S5P6440: DMA: Add platform devices for PL330 DMACs	2010-05-18 18:00:12 +09:00
entry-macro.S
gpio.h
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: S5P6440: Add IRQ support	2010-01-15 19:16:21 +09:00
map.h	ARM: Merge for-2635-4/watchdog	2010-05-20 19:51:40 +09:00
memory.h
pwm-clock.h	ARM: S5P6440: Bug fix on PWM Timer	2010-05-11 09:32:39 +09:00
regs-clock.h	ARM: S5P6440: Move common memory map definitions for S5P	2010-01-27 17:43:07 +09:00
regs-gpio.h	ARM: S5P6440: Add S5P6440 GPIO support	2010-01-19 18:37:18 +09:00
regs-irq.h	ARM: S5P6440: Add IRQ support	2010-01-15 19:16:21 +09:00
spi-clocks.h	ARM: S5P6440: Define SPI platform devices	2010-05-20 19:37:23 +09:00
system.h
tick.h	ARM: S5P6440: Move common memory map definitions for S5P	2010-01-27 17:43:07 +09:00
timex.h	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00
uncompress.h
vmalloc.h	ARM: SAMSUNG: Move include/mach files out of plat-s3c	2010-02-24 01:52:12 +00:00