Merge git://www.linux-watchdog.org/linux-watchdog