Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2013 17:26:50 +0000 (10:26 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 29 Jun 2013 17:26:50 +0000 (10:26 -0700)
commit82d0b80ad6346cee3200b7c7bb1fc975481b7703
treea1e8b5ac321e1f46c389549f3b978a7681feb631
parent98b6ed0f2bf4abfb759206aa70690636372bdee7
parent2976b10f05bd7f6dab9f9e7524451ddfed656a89
Merge branch 'perf-urgent-for-linus' of git://git./linux/kernel/git/tip/tip

Pull perf fix from Ingo Molnar:
 "One more fix for a recently discovered bug"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf: Disable monitoring on setuid processes for regular users