]> 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)
commit4bb280dd1dca8f6881610d7c48b6d9299f1653ad
tree0f572150495eddce59a83035cf6f73448a0302be
parent4bddae553cc3360b735c0262d8f4f827ceb34f8b
parent0cc45a253e2b5bb341a5e003131468a6463bd96d
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