summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-06 18:07:05 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-06 18:07:05 (GMT)
commitf3b0cfa9b017a9d4686c9b14b908a1685f97a077 (patch)
tree714e88b7464d3e66adc5f1c06275a8c171bcd4c4 /include
parent2af49b6058d857fa5b476db642d4452bf5833ecd (diff)
parent5bdb05f91b27b9361c4f348a4e05999f597df72e (diff)
downloadlinux-fsl-qoriq-f3b0cfa9b017a9d4686c9b14b908a1685f97a077.tar.xz
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
Diffstat (limited to 'include')
0 files changed, 0 insertions, 0 deletions