]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-client.git/commitdiff
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Apr 2012 22:31:53 +0000 (15:31 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 26 Apr 2012 22:31:53 +0000 (15:31 -0700)
Pull a watchdog fix from Wim Van Sebroeck:
 "It will fix the size when reading or writing to WD Timer port 0x72 in
  the hpwdt driver."

* git://www.linux-watchdog.org/linux-watchdog:
  hpwdt: Only BYTE reads/writes to WD Timer port 0x72


Trivial merge