diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 07:59:49 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-09-11 07:59:49 -0700 |
| commit | aad1830e6b978f5d90e5d81d071e1752f526f732 (patch) | |
| tree | af5ba1a5ce1574201e4b4da0366a19a4149e0f8c /arch/sparc/kernel/windows.c | |
| parent | Merge branch 'drm-intel-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ickle/drm-intel (diff) | |
| parent | x86, tsc: Fix a preemption leak in restore_sched_clock_state() (diff) | |
| download | linux-dev-aad1830e6b978f5d90e5d81d071e1752f526f732.tar.xz linux-dev-aad1830e6b978f5d90e5d81d071e1752f526f732.zip | |
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/sparc/kernel/windows.c')
0 files changed, 0 insertions, 0 deletions