From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Jan 2013 22:32:07 +0000 (-0800)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v3.8-rc5~20
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ed06ef318a7ddde3823966f808f39b515eae1862;p=platform%2Fupstream%2Fkernel-adaptation-pc.git

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
---

ed06ef318a7ddde3823966f808f39b515eae1862