From: Wim Van Sebroeck <wim@iguana.be>
Date: Wed, 6 Aug 2008 11:58:26 +0000 (+0000)
Subject: [WATCHDOG] Merge code clean-up's from Alan Cox.
X-Git-Tag: v2.6.27-rc3~81^2~13
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96e2e6fafaedd83bd899f682907e14d1eec17390;p=pandora-kernel.git

[WATCHDOG] Merge code clean-up's from Alan Cox.

Merge branch 'alan' of ../linux-2.6-watchdog-mm
Fixed Conflicts in the following files:
	drivers/watchdog/booke_wdt.c
	drivers/watchdog/mpc5200_wdt.c
	drivers/watchdog/sc1200wdt.c

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
---

96e2e6fafaedd83bd899f682907e14d1eec17390
Reading git-diff-tree failed