Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2013 22:32:07 +0000 (14:32 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 22 Jan 2013 22:32:07 +0000 (14:32 -0800)
commited06ef318a7ddde3823966f808f39b515eae1862
treeb66304586760f5d4e03955ebf70cb27fdc6c8747
parent343391b1d14cf1e282f3cf5b4ea416c2ae2a4c9a
parentacb8fb04b74e1c26117b89945dc058b52b28ccb9
Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

 . revert 20b279 - require exclude_guest to use PEBS - kernel side, now
   older binaries will continue working for things like cycles:pp
   without needing to pass extra modifiers, from David Ahern.

 . Fix building from 'make perf-*-src-pkg' tarballs, broken by UAPI,
   from Sebastian Andrzej Siewior

[ Pulling directly, Ingo would normally pull but has been unresponsive ]

* tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  perf tools: Fix building from 'make perf-*-src-pkg' tarballs
  perf x86: revert 20b279 - require exclude_guest to use PEBS - kernel side