commit | d9405057c18cdc62eade7106a774d87a3e080875 | [log] [tgz] |
---|---|---|
author | Linus Torvalds <torvalds@woody.osdl.org> | Tue Dec 12 18:51:36 2006 -0800 |
committer | Linus Torvalds <torvalds@woody.osdl.org> | Tue Dec 12 18:51:36 2006 -0800 |
tree | ba3567e949789f8459ea4d79699a5bc831b97abc | |
parent | c4366889dda8110247be59ca41fddb82951a8c26 [diff] | |
parent | a57bf8a4f23cca2b5be5446649bbe22d1440af5d [diff] |
Merge master.kernel.org:/pub/scm/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