]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Oct 2013 20:57:10 +0000 (13:57 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 10 Oct 2013 20:57:10 +0000 (13:57 -0700)
commitf112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1
tree8792159f0212c3b296c5894f85f68b9d443672b0
parent0ff18e3734c248fa516b4be942b1196832ee936c
parent0821f20d49d19f49e53b05ef6727e010c4b1f11d
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fix from Wim Van Sebroeck:
 "Make sure that the hpwdt driver will not load auxilary iLO devices"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: hpwdt: Patch to ignore auxilary iLO devices