Merge branch 'perf/urgent' into perf/core
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 6 Feb 2012 21:10:52 +0000 (19:10 -0200)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 6 Feb 2012 21:11:02 +0000 (19:11 -0200)
commit5ddf146f70a44ed4133dea4d377b172605a1cfa5
tree058b6f58b5ab756f9fe798983e7c7bbf75450509
parent781ba9d2ed9df07dbb413fb5ee80ef7d353841c9
parenta4a03fc7ef89020baca4f19174e6a43767c6d78a
Merge branch 'perf/urgent' into perf/core

So that we can get the perf bench exec stack fixes and then apply the
remaining fix for the files added after what is in perf/urgent.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
arch/x86/kernel/cpu/perf_event.c
tools/perf/bench/mem-memcpy-x86-64-asm.S
tools/perf/util/evsel.c