diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 11:30:10 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-12-10 11:30:10 -0800 |
| commit | 9538e10086bd1301fe915683b1ba0a1de66d7483 (patch) | |
| tree | 5fe464dca440c75843b04cbad1ee703ca82a96e9 /drivers/gpu/drm/i915/i915_drv.h | |
| parent | 5e0af24cee56e75d0cb13dc072539acb52f694cf (diff) | |
| parent | dace8bbfccfd9e4fcccfffcfbd82881fda3e756f (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
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 'drivers/gpu/drm/i915/i915_drv.h')
0 files changed, 0 insertions, 0 deletions