ARM: Merge for-2635-4/watchdog
authorBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 10:51:40 +0000 (19:51 +0900)
committerBen Dooks <ben-linux@fluff.org>
Thu, 20 May 2010 10:51:40 +0000 (19:51 +0900)
commit6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c
tree6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d
parenta2f7bffa29f18266bc7b55a2b47a5fa1274ed53f
parent5b7d7b22dc8469fbe1ca10b2adeabb70639bde01
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
arch/arm/mach-s3c64xx/Kconfig
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
arch/arm/plat-samsung/Kconfig
arch/arm/plat-samsung/Makefile