From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 19 Feb 2009 08:00:35 +0000 (+0100)
Subject: Merge branch 'linus' into tracing/blktrace
X-Git-Tag: v2.6.30-rc1~2^2~99
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=72c26c9a26ea7f2f3d14f162c2ebb07805f724ea;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'linus' into tracing/blktrace

Conflicts:
	block/blktrace.c

Semantic merge:
	kernel/trace/blktrace.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

72c26c9a26ea7f2f3d14f162c2ebb07805f724ea