Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 2 May 2012 17:33:34 +0000 (19:33 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 2 May 2012 17:33:34 +0000 (19:33 +0200)
commit4c8570362652ec427e8282d9c528bcc6cbe1075c
tree6540196a1d3e0b626ca7c3be6708dfd11779814f
parent529acf58981440eefeaf1451387e2a0aa4825c12
parent5622c07b4741e0afd7607bce6e850b76eeb23210
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>