Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm… · git-mirror/linux@f3b0cfa · GitHub

Commit

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

Browse files

…/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

Loading branch information

Linus Torvalds committed Jan 6, 2011

2 parents 2af49b6 + 5bdb05f commit f3b0cfa