tree a74f3769fdeb1ed46b8495e8ad3d8aa86e63604c
parent 8e8bb96d247fc67eb66a2ebcc6fd45787b5a8b15
parent 8aa8a7c80ccdfac2df5ee48a51a4a7bee2143d4f
author Linus Torvalds <torvalds@linux-foundation.org> 1331683490 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1331683490 -0700

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