tree 04f171157bd4c43a7fff841f310cb543ec31966c
parent 2024da603978882d102a34d47828a205fffb338e
parent 06063e26bc3ab62aa7aca874c6ce9e7638673838
author Linus Torvalds <torvalds@woody.linux-foundation.org> 1193182590 -0700
committer Linus Torvalds <torvalds@woody.linux-foundation.org> 1193182590 -0700

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] Documentation/watchdog/src/watchdog-simple.c: improve this code
  [WATCHDOG] AR7: watchdog timer
  [WATCHDOG] Linux kernel IPC SBC Watchdog Timer driver