]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 06:48:47 +0000 (20:48 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 3 Aug 2011 06:48:47 +0000 (20:48 -1000)
commit4400478ba3d939b680810aa004f1e954b4f8ba16
tree416adac94a45cf935a792cd19c35cd52308e3094
parent0d7e92da50763b53b59b490ce57a323039ee241d
parent7abdd34dbf58bf271db7ee6551f2ff72204a83fd
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-watchdog:
  watchdog: Cleanup WATCHDOG_CORE help text
  watchdog: Fix POST failure on ASUS P5N32-E SLI and similar boards
  watchdog: shwdt: fix usage of mod_timer