tree 38a555bdd527413626389815312419f6e3d78425
parent 0e93b4b304ae052ba1bc73f6d34a68556fe93429
parent 9b63776fa3ca96c4ecda76f6fa947b7b0add66ac
parent c3709e6734daa4d9b37fe31592ebb0eb57bae1bb
parent 30b4e9eb783d94e9f5d503b15eb31720679ae1c7
author Linus Torvalds <torvalds@linux-foundation.org> 1337272517 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1337272517 -0700

Merge branches 'perf-urgent-for-linus', 'x86-urgent-for-linus' and 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf, x86 and scheduler updates from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  tracing: Do not enable function event with enable
  perf stat: handle ENXIO error for perf_event_open
  perf: Turn off compiler warnings for flex and bison generated files
  perf stat: Fix case where guest/host monitoring is not supported by kernel
  perf build-id: Fix filename size calculation

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, kvm: KVM paravirt kernels don't check for CPUID being unavailable
  x86: Fix section annotation of acpi_map_cpu2node()
  x86/microcode: Ensure that module is only loaded on supported Intel CPUs

* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  sched: Fix KVM and ia64 boot crash due to sched_groups circular linked list assumption