]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit43c2a9e7912b3a254cab3d76656574b9f6bba875
tree6bdfd633a261a0b434ad7060a3c2d1ee1d9b377d
parentdc53af4468963e6273f3b1e83947566813b6513e
parentd11b5ffb66deda7f965f3eb1ebc78b1b43f1adbe
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