summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-05-17 18:35:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2012-05-17 18:35:17 +0200
commit31ae98359d26ff89b745c4f8094093cbf6ccbdc6 (patch)
tree38a555bdd527413626389815312419f6e3d78425 /include
parentMerge git://git.kernel.org/pub/scm/virt/kvm/kvm (diff)
parenttracing: Do not enable function event with enable (diff)
parentx86, kvm: KVM paravirt kernels don't check for CPUID being unavailable (diff)
parentsched: Fix KVM and ia64 boot crash due to sched_groups circular linked list a... (diff)
downloadlinux-31ae98359d26ff89b745c4f8094093cbf6ccbdc6.tar.xz
linux-31ae98359d26ff89b745c4f8094093cbf6ccbdc6.zip
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