tree a3adf6532e572b2b0cf66cbb44807f33e8808b53
parent 53381e2e34f741350bd00f592d2b6c3710ba5177
parent ce75632cc4012f1832bd56efd97c2ba75ca964bb
author Linus Torvalds <torvalds@linux-foundation.org> 1479141006 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> 1479141006 -0800

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar:
 "An uncore PMU driver hardware enablement change for Intel SkyLake
  uncore PMUs (Skylake Y, U, H and S platforms), plus a number of
  tooling fixes for the histogram handling/displaying code"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf/x86/intel/uncore: Add more Intel uncore IMC PCI IDs for SkyLake
  perf hists: Fix column length on --hierarchy
  perf hists browser: Fix column indentation on --hierarchy
  perf hists browser: Show folded sign properly on --hierarchy
  perf hists browser: Fix indentation of folded sign on --hierarchy
  perf hist browser: Fix hierarchy column counts