tree 8792159f0212c3b296c5894f85f68b9d443672b0
parent 0ff18e3734c248fa516b4be942b1196832ee936c
parent 0821f20d49d19f49e53b05ef6727e010c4b1f11d
author Linus Torvalds <torvalds@linux-foundation.org> 1381438630 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1381438630 -0700

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