From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 10 Oct 2013 20:57:10 +0000 (-0700)
Subject: Merge git://www.linux-watchdog.org/linux-watchdog
X-Git-Tag: v3.12-rc5~18
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1;p=kernel%2Fkernel-generic.git

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
---

f112bf8585b9ce4e3cce2eee6b8319eb9fee3ec1