Skip to content
  • Linus Torvalds's avatar
    Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog · 2f63251e
    Linus Torvalds authored
    * git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog: (28 commits)
      [WATCHDOG] Fix pcwd_init_module crash
      [WATCHDOG] ICH9 support for iTCO_wdt
      [WATCHDOG] 631xESB/632xESB support for iTCO_wdt - add all LPC bridges
      [WATCHDOG] 631xESB/632xESB support for iTCO_wdt
      [WATCHDOG] omap_wdt.c - default error for IOCTL is -ENOTTY
      [WATCHDOG] Return value of nonseekable_open
      [WATCHDOG] mv64x60_wdt: Rework the timeout register manipulation
      [WATCHDOG] mv64x60_wdt: disable watchdog timer when driver is probed
      [WATCHDOG] mv64x60_wdt: Support the WDIOF_MAGICCLOSE feature
      [WATCHDOG] mv64x60_wdt: Add a module parameter to change nowayout setting
      [WATCHDOG] mv64x60_wdt: Add WDIOC_SETOPTIONS ioctl support
      [WATCHDOG] mv64x60_wdt: Support for WDIOC_SETTIMEOUT ioctl
      [WATCHDOG] mv64x60_wdt: Fix WDIOC_GETTIMEOUT return value
      [WATCHDOG] mv64x60_wdt: Check return value of nonseekable_open
      [WATCHDOG] mv64x60_wdt: Add arch/powerpc platform support
      [WATCHDOG] mv64x60_wdt: Get register address from platform data
      [WATCHDOG] mv64x60_wdt: set up platform_device in platform code
      [WATCHDOG] ensure mouse and keyboard ignored in w83627hf_wdt
      [WATCHDOG] s3c2410_wdt: fixup after arch include moves
      [WATCHDOG] git-watchdog-typo
      ...
    2f63251e