tree bc93b1e96dda7e1dc6f1aff498767c627f2de638
parent a3a71ca9a715776cf3eda605dafdb4a383782c4f
parent 59647b6ac3050dd964bc556fe6ef22f4db5b935c
author Linus Torvalds <torvalds@linux-foundation.org> 1265328461 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1265328461 -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:
  futex: Handle futex value corruption gracefully
  futex: Handle user space corruption gracefully
  futex_lock_pi() key refcnt fix
  softlockup: Add sched_clock_tick() to avoid kernel warning on kgdb resume