tree f9531f3bef8446e0eb2f9f4ba1ed6fa1000585c8
parent 836f48c5f8c6ef004419f1605514aa05eb58eefb
parent 6d558c3ac9b6508d26fd5cadccce51fc9d726b1c
author Linus Torvalds <torvalds@linux-foundation.org> 1264092592 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1264092592 -0800

Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  sched: Reassign prev and switch_count when reacquire_kernel_lock() fail
  sched: Fix vmark regression on big machines