]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2011 20:34:41 +0000 (13:34 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 7 Apr 2011 20:34:41 +0000 (13:34 -0700)
commit0c3efe54d0165cecf0698b468e253577b555dde6
treee004169ae37bc1b9fdc636146bd6967061f6f78a
parent132452ee2368cf775ccbef9746b51e3d2ba58b85
parentd856b418464024dba4c7e901bab74dfb9a030d2e
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  watchdog: mpc8xxx_wdt: fix build