diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 10:59:49 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 10:59:49 -0400 |
| commit | aad1830e6b978f5d90e5d81d071e1752f526f732 (patch) | |
| tree | af5ba1a5ce1574201e4b4da0366a19a4149e0f8c /arch | |
| parent | 3e6dce76d99b328716b43929b9195adfee1de00c (diff) | |
| parent | 55496c896b8a695140045099d4e0175cf09d4eae (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:
x86, tsc: Fix a preemption leak in restore_sched_clock_state()
sched: Move sched_avg_update() to update_cpu_load()
Diffstat (limited to 'arch')
0 files changed, 0 insertions, 0 deletions