]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...
authorIngo Molnar <mingo@elte.hu>
Thu, 16 Jun 2011 11:26:23 +0000 (13:26 +0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 16 Jun 2011 11:26:23 +0000 (13:26 +0200)
commit1f13fce4223557322d1d6cedc7ff6c8c0adba328
treef464a6df26e0b62ba23c22de954cd58fb9a59aaa
parent09c4c279e1a25d4b343930712b90f5f76ea07aa3
parente2cae7ecb70c2c2f5c4f3eb1f6c4bd6c15c48a12
Merge branch 'tip/perf/core-2' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into perf/core

Conflicts:
Makefile
Makefile