Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 17:09:14 +0000 (10:09 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 9 May 2013 17:09:14 +0000 (10:09 -0700)
commitbde9d73ddc85725ccdc9863b37acc0f03806b281
treedf243274eeca109a49b0c4a2581804420c5b44b8
parent5647ac0ad4f355817b788372a01cb293ed63bde4
parent60403f7a4d9368d187f79cba5e4672d01df37574
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog update from Wim Van Sebroeck:
 "Fix a kdump issue in hpwdt and a possible NULL dereference"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: Fix race condition in registration code
  watchdog: Convert to devm_ioremap_resource()