diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 20:30:10 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 20:30:10 +0100 |
| commit | 9538e10086bd1301fe915683b1ba0a1de66d7483 (patch) | |
| tree | 5fe464dca440c75843b04cbad1ee703ca82a96e9 /kernel/futex.c | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egt... (diff) | |
| parent | sc1200_wdt: Fix oops (diff) | |
| download | linux-9538e10086bd1301fe915683b1ba0a1de66d7483.tar.xz linux-9538e10086bd1301fe915683b1ba0a1de66d7483.zip | |
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
487722cf2d66 ("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
Diffstat (limited to '')
0 files changed, 0 insertions, 0 deletions