tree aad97e94afe668b2fe734ef28536627ec00860d8
parent 756300983f11a1c6f9457d6d8f57354e0f0fe8d4
parent ea5b41f9d595be354f7a50e56b28c2d72e6e88a5
author Linus Torvalds <torvalds@linux-foundation.org> 1260593301 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1260593301 -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:
  lockdep: Avoid out of bounds array reference in save_trace()
  futex: Take mmap_sem for get_user_pages in fault_in_user_writeable
  lockstat: Add usage info to Documentation/lockstat.txt
  lockstat: Fix min, max times in /proc/lock_stats