| commit | 341031caec0cd730e84d248d95851bf54ec4e41f | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 21 08:49:52 2010 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Thu Jan 21 08:49:52 2010 -0800 |
| tree | f9531f3bef8446e0eb2f9f4ba1ed6fa1000585c8 | |
| parent | 836f48c5f8c6ef004419f1605514aa05eb58eefb [diff] | |
| parent | 6d558c3ac9b6508d26fd5cadccce51fc9d726b1c [diff] |
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