]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Mar 2012 00:04:50 +0000 (17:04 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 14 Mar 2012 00:04:50 +0000 (17:04 -0700)
commit0a49aecaf416377b64d0f03907c2412acbb396be
treea74f3769fdeb1ed46b8495e8ad3d8aa86e63604c
parent8e8bb96d247fc67eb66a2ebcc6fd45787b5a8b15
parent8aa8a7c80ccdfac2df5ee48a51a4a7bee2143d4f
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull perf fixes from Ingo Molnar.

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf record: Fix buffer overrun bug in tracepoint_id_to_path()
  perf/x86: Fix local vs remote memory events for NHM/WSM