commit 3b383767c41be070cae24875789d97b42a3e71a8
author Linus Torvalds <torvalds@linux-foundation.org> Sat Sep 26 10:15:53 2009 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Sat Sep 26 10:15:53 2009 -0700
tree 414a2c3aa750fd25b84f477e2b9cdca17086602a
parent 49e70dda359660f20fa21d03bfae132e15c78195
parent 9beba3c54dd180a26a1da2027cfbe9edfaf9c40e

Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Add memory barrier commentary to futex_wait_queue_me()
  futex: Fix wakeup race by setting TASK_INTERRUPTIBLE before queue_me()
  futex: Correct futex_q woken state commentary
  futex: Make function kernel-doc commentary consistent
  futex: Correct queue_me and unqueue_me commentary
  futex: Correct futex_wait_requeue_pi() commentary