tree f464a6df26e0b62ba23c22de954cd58fb9a59aaa
parent b4f9f2b64aa189c5584f266f4f0343af7a705441
parent 0ef5bf1cd3bd2e3eacb11fca80efe3674927ed1a
author Ingo Molnar <mingo@elte.hu> 1308223583 +0200
committer Ingo Molnar <mingo@elte.hu> 1308223583 +0200

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