]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
projects / mirror_ubuntu-disco-kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 13fb2d1 741b9c7)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Mar 2012 02:27:43 +0000 (18:27 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 2 Mar 2012 02:27:43 +0000 (18:27 -0800)
commit1f033c1a6ec1a6815e9c4507d83eb20161163c37
treeef2f12d633a231d341c9bbd1b75b0cf22c21d67dtree
parent13fb2d10371581f42c81da54ef7a1e1a9dfe6d46commit | diff
parent741b9c7da1abf2f96f69d232fbeef5aff1371be3commit | diff
Merge git://www.linux-watchdog.org/linux-watchdog

Watchdog updates from Wim Van Sebroeck:

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: fix GETTIMEOUT ioctl in booke_wdt
  watchdog: update maintainers git entry
  watchdog: Fix typo in pnx4008_wdt.c
  watchdog: Fix typo in Kconfig
  watchdog: fix error in probe() of s3c2410_wdt (reset at booting)
  watchdog: hpwdt: clean up set_memory_x call for 32 bit
Ubuntu Disco kernel mirror for Proxmox VE and PMG