aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-04-23 11:45:52 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2016-04-23 11:45:52 -0700
commit82b23cb94b8cee25781c209d9b1df3b144c8bb5f (patch)
treef81d9203a83dfedae8aeeabff03ab955684f44d7
parent0e11d256512c5166e03c9e9f221f9371bd42911e (diff)
parenta19cad6d66823ddd54b0e7c88d7bddd307cb1161 (diff)
parent3b9d6da67e11ca8f78fde887918983523a36b0fa (diff)
parent16eeed7e5558a3dcf30f75526a896b2632f299f9 (diff)
downloadlinux-stericsson-82b23cb94b8cee25781c209d9b1df3b144c8bb5f.tar.gz
Merge branches 'perf-urgent-for-linus', 'smp-urgent-for-linus' and 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf, cpu hotplug and timer fixes from Ingo Molnar: "perf: - A single tooling fix for a user-triggerable segfault. CPU hotplug: - Fix a CPU hotplug corner case regression, introduced by the recent hotplug rework timers: - Fix a boot hang in the ARM based Tango SoC clocksource driver" * 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: perf intel-pt: Fix segfault tracing transactions * 'smp-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: cpu/hotplug: Fix rollback during error-out in __cpu_disable() * 'timers-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: clocksource/drivers/tango-xtal: Fix boot hang due to incorrect test