tree a078d06b9d9ceb45b4b26d1b69d47e1fa465a38e
parent 51cd8e6ff265650e35e46b5bcbe2ee381a7a2877
parent 3e5531caffcc07b67452c4a8170ffb4c2bd1c9b7
author Linus Torvalds <torvalds@linux-foundation.org> 1346265300 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1346265300 -0700

Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "This will fix a warning for watchdog-test.c and it will remove a
  duplicate include of delay.h"

* git://www.linux-watchdog.org/linux-watchdog:
  watchdog: da9052: Remove duplicate inclusion of delay.h
  watchdog: fix watchdog-test.c build warning