From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 15 Feb 2009 19:08:55 +0000 (+0100)
Subject: Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core
X-Git-Tag: v2.6.30-rc1~2^2~106
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=9abd60304816a5b0fd9e51034f78e3eaed89f901;p=users%2Fjedix%2Flinux-maple.git

Merge branches 'tracing/ftrace' and 'tracing/urgent' into tracing/core

Conflicts:
	kernel/trace/trace_mmiotrace.c
---

9abd60304816a5b0fd9e51034f78e3eaed89f901