From: Linus Torvalds Date: Sat, 23 Mar 2013 19:30:39 +0000 (-0700) Subject: Merge git://www.linux-watchdog.org/linux-watchdog X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a4e71e7937461730998cef56cc924fe731b4d345;p=linux-beck.git Merge git://www.linux-watchdog.org/linux-watchdog Pull watchdog fixes from Wim Van Sebroeck: "Fix a boot issues and correct the AcpiMmioSel bitmask in the sp5100_tco watchdog device driver" * git://www.linux-watchdog.org/linux-watchdog: watchdog: sp5100_tco: Set the AcpiMmioSel bitmask value to 1 instead of 2 watchdog: sp5100_tco: Remove code that may cause a boot failure --- a4e71e7937461730998cef56cc924fe731b4d345