From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 29 Aug 2012 18:35:00 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.12-rc1~2471
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a7ccbcf3307022c48810eebd99aa8dba84f13caf;p=kernel%2Fkernel-generic.git

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a warning for watchdog-test.c and it will remove a
  duplicate include of delay.h"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: da9052: Remove duplicate inclusion of delay.h
  watchdog: fix watchdog-test.c build warning
---

a7ccbcf3307022c48810eebd99aa8dba84f13caf