]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3a630c4 2c8d361)
Merge git://www.linux-watchdog.org/linux-watchdog
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Dec 2013 19:30:10 +0000 (11:30 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Dec 2013 19:30:10 +0000 (11:30 -0800)
commitc8733422bce8bb13bac3e15c0762072910ba97f5
tree5fe464dca440c75843b04cbad1ee703ca82a96e9tree | snapshot
parent3a630c4c38b663756cc52484ee9953c2e6e77fa4commit | diff
parent2c8d3613ae6d68e44b783b9098486830e264c959commit | diff
Merge git://www.linux-watchdog.org/linux-watchdog

Pull watchdog fixes from Wim Van Sebroeck:
 "Drop the unnecessary miscdevice.h includes that we forgot in commit
  f59f73710dff ("watchdog: Get rid of MODULE_ALIAS_MISCDEV statements")
  and fix an oops for the sc1200_wdt driver"

* git://www.linux-watchdog.org/linux-watchdog:
  sc1200_wdt: Fix oops
  watchdog: Drop unnecessary include of miscdevice.h
Linux Kernel Source Tree.