summaryrefslogtreecommitdiff
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-12-10 11:30:10 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2013-12-10 11:30:10 -0800
commit9538e10086bd1301fe915683b1ba0a1de66d7483 (patch)
tree5fe464dca440c75843b04cbad1ee703ca82a96e9 /kernel/futex.c
parent5e0af24cee56e75d0cb13dc072539acb52f694cf (diff)
parentdace8bbfccfd9e4fcccfffcfbd82881fda3e756f (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 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions