From: Ben Dooks <ben-linux@fluff.org>
Date: Thu, 20 May 2010 10:51:40 +0000 (+0900)
Subject: ARM: Merge for-2635-4/watchdog
X-Git-Tag: v2.6.35-rc1~264^2~1^2^2~23
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c;p=pandora-kernel.git

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
---

6aeaad51aaecc9ebc8c1e8f132655e2ae8141f8c
Reading git-diff-tree failed