Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 06:59:31 +0000 (08:59 +0200)
committerIngo Molnar <mingo@kernel.org>
Wed, 30 May 2012 07:01:40 +0000 (09:01 +0200)
commit55b78e34b12d07b8ab7d7732fd24892df8eea5c7
treedead7017e67403bdae20db5f2a3a409af9eea7d3
parentc985f7812331d79483beab932e8966477411a942
parenta44b45f236dd1c1a8caccf9a078adf2941a20267
Merge tag 'perf-urgent-for-mingo' of git://git./linux/kernel/git/acme/linux into perf/urgent

Fixes for perf/urgent from Arnaldo Carvalho de Melo:

 * Fix fallback to --stdio when TUI not supported, from Namhyung Kim.

 * Use right cast for pointers/long in libtraceevent, from Namhyung Kim.

 * Be consistent on using the right error reporting interface for fatal errors,
   from Namhyung Kim.

 * Fix fallback to --stdio when TUI not supported, from Namhyung Kim.

 * Use the right index in asm only view in the annotate browser.

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