summaryrefslogtreecommitdiff
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2017-04-04 11:31:12 +0200
committerThomas Gleixner <tglx@linutronix.de>2017-04-04 11:31:12 +0200
commit38bffdac071b720db627bfd2b125a2802a04d419 (patch)
treec2e9cf66fa6ff1cc3092079e3eedeb4e6c402227 /kernel/futex.c
parent57dd924e541a98219bf3a508623db2e0c07e75a7 (diff)
parenta481db34b9beb7a9647c23f2320dd38a2b1d681f (diff)
Merge branch 'sched/core' into locking/core
Required for the rtmutex/sched_deadline patches which depend on both branches
Diffstat (limited to 'kernel/futex.c')
0 files changed, 0 insertions, 0 deletions