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)
commit868f480bed5266347b168c2bbe7b010cf9cac1dd
tree9a43f48568521eda7af3f2e559846402f205f7ec
parent6d77987fe62eb97479f27426d12f33ef97145c5b
parentb232a70a1735c004f9ee6fdf363def527b9234b6
Merge git://www.linux-watchdog.org/linux-watchdog

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