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
..
mach	ARM: Merge for-2635-4/watchdog	2010-05-20 19:51:40 +09:00