tree 9a43f48568521eda7af3f2e559846402f205f7ec
parent 6d77987fe62eb97479f27426d12f33ef97145c5b
parent b232a70a1735c004f9ee6fdf363def527b9234b6
author Linus Torvalds <torvalds@linux-foundation.org> 1348256183 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1348256183 -0700

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