Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 14:24:42 +0000 (07:24 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 25 Sep 2009 14:24:42 +0000 (07:24 -0700)
commitc09c2d1089b55a3da7058a2f1a76c2f21c8b0688
tree627fd280d884f289f3c646b8f9a1f940dbf8897b
parent5c3cc2084dd9dc26b258f88abb629550090956e0
parent38461c5c084ec9119f481f27629d84283733b82a
Merge git://git./linux/kernel/git/wim/linux-2.6-watchdog

* git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] Add support for the Avionic Design Xanthos watchdog timer.