From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 2 Dec 2008 08:20:29 +0000 (+0100)
Subject: Merge branch 'tracing/urgent' into tracing/core
X-Git-Tag: v2.6.29-rc1~586^2~39
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=74bf3cabc306f31ddd02f2c1b0540a6cfcacc593;p=users%2Fwilly%2Flinux.git

Merge branch 'tracing/urgent' into tracing/core

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

74bf3cabc306f31ddd02f2c1b0540a6cfcacc593