Skip to content
  • Linus Torvalds's avatar
    Merge git://www.linux-watchdog.org/linux-watchdog · 833e6834
    Linus Torvalds authored
    Pull watchdog updates from Wim Van Sebroeck:
     - lots of devm_ conversions and cleanup
     - platform_set_drvdata cleanups
     - s3c2410: dev_err/dev_info + dev_pm_ops
     - watchdog_core: don't try to stop device if not running fix
     - wdrtas: use print_hex_dump
     - xilinx cleanups
     - orion_wdt fixes
     - softdog cleanup
     - hpwdt: check on UEFI bits
     - deletion of mpcore_wdt driver
     - addition of broadcom BCM2835 watchdog timer driver
     - addition of MEN A21 watcdog devices
    
    * git://www.linux-watchdog.org/linux-watchdog: (38 commits)
      watchdog: hpwdt: Add check for UEFI bits
      watchdog: softdog: remove replaceable ping operation
      watchdog: New watchdog driver for MEN A21 watchdogs
      Watchdog: fix clearing of the watchdog interrupt
      Watchdog: allow orion_wdt to be built for Dove
      watchdog: Add Broadcom BCM2835 watchdog timer driver
      watchdog: delete mpcore_wdt driver
      watchdog: xilinx: Setup the origin compatible string
      watchdog: xilinx: Fix driver header
      watchdog: wdrtas: don't use custom version of print_hex_dump
      watchdog: core: don't try to stop device if not running
      watchdog: jz4740: Pass device to clk_get
      watchdog: twl4030: Remove redundant platform_set_drvdata()
      watchdog: mpcore: Remove redundant platform_set_drvdata()
      watchdog: da9055: use platform_{get,set}_drvdata()
      watchdog: da9052: use platform_{get,set}_drvdata()
      watchdog: cpwd: use platform_{get,set}_drvdata()
      watchdog: s3c2410_wdt: convert s3c2410wdt to dev_pm_ops
      watchdog: s3c2410_wdt: use dev_err()/dev_info() instead of pr_err()/pr_info()
      watchdog: wm831x: use platform_{get,set}_drvdata()
      ...
    833e6834