]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 16:49:52 +0000 (08:49 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 21 Jan 2010 16:49:52 +0000 (08:49 -0800)
commit341031caec0cd730e84d248d95851bf54ec4e41f
treef9531f3bef8446e0eb2f9f4ba1ed6fa1000585c8
parent836f48c5f8c6ef004419f1605514aa05eb58eefb
parent6d558c3ac9b6508d26fd5cadccce51fc9d726b1c
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