tree c97efa3ce9883d6f52f8e8b351019ec42f6fea20
parent 0e053738b50836e9d1e94b2295ef2942eb471078
parent 1b7558e457ed0de61023cfc913d2c342c7c3d9f2
author Linus Torvalds <torvalds@linux-foundation.org> 1214250562 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1214250562 -0700

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: fix fault handling in futex_lock_pi