summaryrefslogtreecommitdiffstats
path: root/drivers/infiniband
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2015-08-03 10:52:25 +0200
committerIngo Molnar <mingo@kernel.org>2015-08-03 10:52:25 +0200
commit3a7651e683701dbb4c7d02e20661c923fa4c6901 (patch)
tree20e2a6550952517f20206211dd79ed258010f80a /drivers/infiniband
parentfutex: Make should_fail_futex() static (diff)
parentlocking/pvqspinlock: Fix kernel panic in locking-selftest (diff)
parentLinux 4.2-rc5 (diff)
downloadlinux-3a7651e683701dbb4c7d02e20661c923fa4c6901.tar.xz
linux-3a7651e683701dbb4c7d02e20661c923fa4c6901.zip
Merge branch 'locking/urgent', tag 'v4.2-rc5' into locking/core, to pick up fixes before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>