Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 02:51:36 +0000 (18:51 -0800)
committerLinus Torvalds <torvalds@woody.osdl.org>
Wed, 13 Dec 2006 02:51:36 +0000 (18:51 -0800)
commitd9405057c18cdc62eade7106a774d87a3e080875
treeba3567e949789f8459ea4d79699a5bc831b97abc
parentc4366889dda8110247be59ca41fddb82951a8c26
parenta57bf8a4f23cca2b5be5446649bbe22d1440af5d
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