tree 182e640660eac46dc656e4eaa508adb7175ca199
parent c6a93d330b53fa587f550aedcdeb93ff23ea7f87
parent 7485d0d3758e8e6491a5c9468114e74dc050785d
author Linus Torvalds <torvalds@linux-foundation.org> 1263673890 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1263673890 -0800

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:
  futexes: Remove rw parameter from get_futex_key()