tree 0199e3ec8d3ad7799468f51d251b542192099777
parent 6dde39be39e636c1d41e73590668d5903b11535b
parent e7a3481c0246c8e45e79c629efd63b168e91fcda
parent 18483b81ee7e70ee68d4b18be618be5cfcc0b290
parent 61ab25447ad6334a74e32f60efb135a3467223f8
author Linus Torvalds <torvalds@linux-foundation.org> 1291819259 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1291819259 -0800

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