]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2015 00:00:13 +0000 (14:00 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 15 Jun 2015 00:00:13 +0000 (14:00 -1000)
commitfbf0aedab629d1c1b5780728df384bd3509e82d7
treefdc0432a3d25fb105ce5fe79ab799f8945f961cf
parent062d34ea22bdb15be339fa01122d1ee90ba5da27
parentf1736e82ef0aa99b0aa5d0f66be7a4ae2e4c8b22
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "A regression fix for a crash, and a Intel HSW uncore PMU driver fix"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  Revert "perf/x86/intel/uncore: Move uncore_box_init() out of driver initialization"
  perf/x86/intel/uncore: Fix CBOX bit wide and UBOX reg on Haswell-EP