tree 955347ebf22af5f7479ea9b01e8e8f14c2c426c0
parent 63589ed0785ffc715777a54ccb96cdfaea9edbc0
parent 853807fb500a9442d88646b7be92bfa51334f8e8
author Linus Torvalds <torvalds@g5.osdl.org> 1144008071 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1144008071 -0700

Merge master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog

* master.kernel.org:/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog:
  [WATCHDOG] at91_wdt.c - Atmel AT91RM9200 watchdog driver
  [WATCHDOG] pcwd_usb.c: fix a NULL pointer dereference
  [WATCHDOG] pcwd.c sprintf/strcpy fix
  [WATCHDOG] pcwd.c general clean-up after patches
  [WATCHDOG] pcwd.c add debug info
  [WATCHDOG] pcwd.c pcwd_cleanup_module patch
  [WATCHDOG] pcwd.c firmware-info patch
  [WATCHDOG] pcwd.c control status patch