From: Ingo Molnar <mingo@kernel.org>
Date: Wed, 2 May 2012 17:33:34 +0000 (+0200)
Subject: Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4c8570362652ec427e8282d9c528bcc6cbe1075c;p=openwrt%2Fstaging%2Fblogic.git

Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Fixes for perf/urgent:

- Add fallback in 'perf stat' for kernels that don't support
  perf_event_attr.exclude_guest, from Stephane Eranian.

- Fix build id cache add routine to take the size of the buffer and not of a
  pointer, from Namhyung Kim.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

4c8570362652ec427e8282d9c528bcc6cbe1075c