]> git.karo-electronics.de Git - mv-sheeva.git/commit - drivers/media/video/sn9c102/sn9c102_core.c
Merge branch 'core-futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 18:07:05 +0000 (10:07 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 6 Jan 2011 18:07:05 +0000 (10:07 -0800)
commitf3b0cfa9b017a9d4686c9b14b908a1685f97a077
tree714e88b7464d3e66adc5f1c06275a8c171bcd4c4
parent2af49b6058d857fa5b476db642d4452bf5833ecd
parent5bdb05f91b27b9361c4f348a4e05999f597df72e
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