projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 51cd8e6 3e5531c)
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)
commita7ccbcf3307022c48810eebd99aa8dba84f13caf
treea078d06b9d9ceb45b4b26d1b69d47e1fa465a38etree | snapshot (tar.gz zip)
parent51cd8e6ff265650e35e46b5bcbe2ee381a7a2877commit | diff
parent3e5531caffcc07b67452c4a8170ffb4c2bd1c9b7commit | 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
Motorola kernel-slsi