tree 848c6a8a0d6f83929daf43d63e241dc8072066ac
parent da5cabf80e2433131bf0ed8993abc0f7ea618c73
parent 1aa54bca6ee0d07ebcafb8ca8074b624d80724aa
author Steven Rostedt <srostedt@redhat.com> 1281971850 -0400
committer Steven Rostedt <rostedt@goodmis.org> 1281971850 -0400

Merge branch 'tip/perf/urgent-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into trace/tip/perf/urgent-4

Conflicts:
	kernel/trace/trace_events.c

Signed-off-by: Steven Rostedt <rostedt@goodmis.org>