diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-08 06:40:59 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-08 06:40:59 -0800 |
| commit | 6313e3c21743cc88bb5bd8aa72948ee1e83937b6 (patch) | |
| tree | 0199e3ec8d3ad7799468f51d251b542192099777 /include/linux | |
| parent | 6dde39be39e636c1d41e73590668d5903b11535b (diff) | |
| parent | e7a3481c0246c8e45e79c629efd63b168e91fcda (diff) | |
| parent | 18483b81ee7e70ee68d4b18be618be5cfcc0b290 (diff) | |
| parent | 61ab25447ad6334a74e32f60efb135a3467223f8 (diff) | |
Merge branches 'x86-fixes-for-linus', 'perf-fixes-for-linus' and 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
x86/pvclock: Zero last_value on resume
* 'perf-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
perf record: Fix eternal wait for stillborn child
perf header: Don't assume there's no attr info if no sample ids is provided
perf symbols: Figure out start address of kernel map from kallsyms
perf symbols: Fix kallsyms kernel/module map splitting
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
nohz: Fix printk_needs_cpu() return value on offline cpus
printk: Fix wake_up_klogd() vs cpu hotplug