]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jun 2012 17:58:57 +0000 (10:58 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 22 Jun 2012 17:58:57 +0000 (10:58 -0700)
commita11637194adc8bf2c2022ac89314dbdd1fcd1778
treeb761d38ee683a71b7140b4203aee1cd319c5ef0e
parent636040b4eddf6152b5d0b2d574663809f898953b
parent6921a575c9f26f7ea274aaea3b78967810ce5513
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf updates from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  ftrace: Make all inline tags also include notrace
  perf: Use css_tryget() to avoid propping up css refcount
  perf tools: Fix synthesizing tracepoint names from the perf.data headers
  perf stat: Fix default output file
  perf tools: Fix endianity swapping for adds_features bitmask