summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/step.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2014-10-31 13:57:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-31 13:57:45 -0700
commitc958f9200fb48d092b17d3784168e4a6c56bbddc (patch)
treee5bdf4fa493521daf96a45ae6a82903189dd03b9 /arch/x86/kernel/step.c
parentaea4869f68b5869afbb308bfb7d777d725df8900 (diff)
parent30a6b8031fe14031ab27c1fa3483cb9780e7f63c (diff)
downloadblackbird-obmc-linux-c958f9200fb48d092b17d3784168e4a6c56bbddc.tar.gz
blackbird-obmc-linux-c958f9200fb48d092b17d3784168e4a6c56bbddc.zip
Merge branch 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull futex fixes from Ingo Molnar: "This contains two futex fixes: one fixes a race condition, the other clarifies shared/private futex comments" * 'locking-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: futex: Fix a race condition between REQUEUE_PI and task death futex: Mention key referencing differences between shared and private futexes
Diffstat (limited to 'arch/x86/kernel/step.c')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud