Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Sep 2012 19:36:23 +0000 (12:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 21 Sep 2012 19:36:23 +0000 (12:36 -0700)
Pull watchdog fixes from Wim Van Sebroeck:
 "Fix a kdump issue in hpwdt and a possible NULL dereference."

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: move the dereference below the NULL test
  hpwdt: Fix kdump issue in hpwdt


Trivial merge