]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 29045a8 dc70659)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Aug 2012 18:35:00 +0000 (11:35 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 29 Aug 2012 18:35:00 +0000 (11:35 -0700)
commite48f1fe7d1421e7437e43b0fa48aedadf8ad18ca
treea078d06b9d9ceb45b4b26d1b69d47e1fa465a38etree | snapshot
parent29045a8661c7cfb8c13904f3a2ba02582fdeb5decommit | diff
parentdc7065992e73d52c6643cd4a1a03961e4f4cf765commit | diff
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
Linux Kernel Source Tree.