From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Dec 2013 19:30:10 +0000 (-0800)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=9538e10086bd1301fe915683b1ba0a1de66d7483;p=deliverable%2Flinux.git

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

Pull watchdog fixes from Wim Van Sebroeck:
 "Drop the unnecessary miscdevice.h includes that we forgot in commit
  487722cf2d66 ("watchdog: Get rid of MODULE_ALIAS_MISCDEV statements")
  and fix an oops for the sc1200_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  sc1200_wdt: Fix oops
  watchdog: Drop unnecessary include of miscdevice.h
---

9538e10086bd1301fe915683b1ba0a1de66d7483