tree 714e88b7464d3e66adc5f1c06275a8c171bcd4c4
parent 2af49b6058d857fa5b476db642d4452bf5833ecd
parent 5bdb05f91b27b9361c4f348a4e05999f597df72e
author Linus Torvalds <torvalds@linux-foundation.org> 1294337225 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1294337225 -0800

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

* 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  futex: Add futex_q static initializer
  futex: Replace fshared and clockrt with combined flags
  futex: Cleanup stale fshared flag interfaces