]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 67eb3ea b3d1b19)
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)
commit6e247c4bbe935b111943c430e9c1adba8b4b53c3
tree5fe464dca440c75843b04cbad1ee703ca82a96e9tree | snapshot
parent67eb3ea8e8f2f6bdab1a6fd52be41cd0aa752d3acommit | diff
parentb3d1b19b78aed5ab2162491e25219a0b163cb505commit | 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
  e33ede828097 ("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.