]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2b8383581d70781c8cc46bea36f17d22033f92b6
tree70509225468cddacb24eccdc78c7d8fc9e0197c5
parent4a4d3f51f7ac14526fe0961f6cc636269a0549a7
parentaf59a38a6f5bb52a0d03c5170257a454f0c4fde3
Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core

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