summaryrefslogtreecommitdiff
path: root/include/linux/futex.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2014-02-27 16:06:55 +0400
committerIngo Molnar <mingo@kernel.org>2014-02-27 16:06:55 +0400
commitd2ae2e525ec4e5d58153fb7ff0c6e5873769fa73 (patch)
tree3379c713515d4073a45ecd18eb5dbd0cecd57e86 /include/linux/futex.h
parentf207dbe63c61158c234e2e8929a3725a7f6b2b9b (diff)
parent70e0ac5f3683f48a8174a6f231a0f3097217c189 (diff)
downloadlinux-d2ae2e525ec4e5d58153fb7ff0c6e5873769fa73.tar.xz
Merge branch 'core/urgent' into core/locking
It's not really a regression fix, so move it to the v3.15 queue. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/futex.h')
0 files changed, 0 insertions, 0 deletions