Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux...
authorIngo Molnar <mingo@elte.hu>
Thu, 18 Aug 2011 19:58:46 +0000 (21:58 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 18 Aug 2011 19:58:46 +0000 (21:58 +0200)
commit51887c8230d57c4d9cc68e3784c52c8f0a708655
tree70509225468cddacb24eccdc78c7d8fc9e0197c5
parent8bc84f87315e8bdbe242ba788fdc6a74d653b177
parent4aa9015f8bfd2c8d7cc33a360275b71a9d708b37
Merge branch 'perf/core' of git://git./linux/kernel/git/acme/linux into perf/core

Conflicts:
tools/perf/builtin-stat.c
tools/perf/builtin-stat.c