]> git.baikalelectronics.ru Git - kernel.git/commit
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Mar 2013 19:30:39 +0000 (12:30 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 23 Mar 2013 19:30:39 +0000 (12:30 -0700)
commit905d5f08888887eab75061a516603413059512c8
tree0f572150495eddce59a83035cf6f73448a0302be
parent7a77a86d21142c9ea999f6e04a08ab4ba5f613f6
parente97a48c18d97ac23c40bbd42cec3889080d7119b
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