]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0edc183 e25d5ce)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Oct 2013 18:41:26 +0000 (11:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sun, 13 Oct 2013 18:41:26 +0000 (11:41 -0700)
commite1917bac3bd8cbdd39f225aaf20d27306fcbd2f2
treee9c7dd3ab1f6a44728e4f95222b98bc22dee73a0tree | snapshot
parent0edc18394a54b4451910c820b8d442363b69b70fcommit | diff
parente25d5ce68f487c2c38966993c36f5deff776d7eacommit | diff
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a deadlock on the ts72xx_wdt driver, fix bitmasks in the
  kempld_wdt driver and fix a section mismatch in the sunxi_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: sunxi: Fix section mismatch
  watchdog: kempld_wdt: Fix bit mask definition
  watchdog: ts72xx_wdt: locking bug in ioctl
Linux Kernel Source Tree.