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	…
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	…
irqs.h	…
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	…
regs-gpio.h	…
regs-irq.h	…
spi-clocks.h	ARM: S5P6440: Define SPI platform devices	2010-05-20 19:37:23 +09:00
system.h	…
tick.h	…
timex.h	…
uncompress.h	…
vmalloc.h	…