diff options
| author | Linus Torvalds | 2010-10-28 15:47:21 -0700 |
|---|---|---|
| committer | Linus Torvalds | 2010-10-28 15:47:21 -0700 |
| commit | a0cadc2777a71b1fde62e6417284b38e52128e88 (patch) | |
| tree | f0e6953108d5ef6e4bf04144d66823825a01d5ed /include/linux/isapnp.h | |
| parent | 671f837a04cbcaaa10e8404989cf08ca3fdf1c80 (diff) | |
| parent | ad1d3a26cdb9a0eaa0bf8351a000df0f256b0baa (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
watchdog: iTCO_wdt.c: remove extra pci_dev_put()'s from init code
watchdog: add support for Broadcom BCM63xx built-in watchdog
watchdog: f71808e_wdt: add support for the F71889FG
watchdog: MachZ: fix debug macro
watchdog: it8712f_wdt: Add module parameter for alternative reset sources
watchdog: it8712f_wdt: Add comments for config/control register names
watchdog: it87_wdt: Add support for watchdogs with 8b timers
watchdog: it87_wdt: Add support for IT8720F watchdog
watchdog: Use static const char * const where possible
watchdog: iTCO_wdt: Cleanup warning messages
watchdog: iTCO_wdt: TCO Watchdog patch for Intel Patsburg DeviceIDs
Diffstat (limited to 'include/linux/isapnp.h')
0 files changed, 0 insertions, 0 deletions