From: Linus Torvalds <torvalds@woody.osdl.org>
Date: Wed, 13 Dec 2006 02:51:36 +0000 (-0800)
Subject: Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
X-Git-Tag: firefly_0821_release~32015
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=d9405057c18cdc62eade7106a774d87a3e080875;p=firefly-linux-kernel-4.4.55.git

Merge /linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] pcwd_usb.c generic HID include file
  [WATCHDOG] watchdog miscdevice patch
  [WATCHDOG] rm9k_wdt: fix interrupt handler arguments
  [WATCHDOG] rm9k_wdt: fix compilation
---

d9405057c18cdc62eade7106a774d87a3e080875