From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 14 Dec 2009 08:16:49 +0000 (+0100)
Subject: Merge branch 'linus' into tracing/urgent
X-Git-Tag: v2.6.33-rc1~52^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=cc0104e877fff32865a67b256d3a9ce52ff15790;p=karo-tx-linux.git

Merge branch 'linus' into tracing/urgent

Conflicts:
	kernel/trace/trace_kprobe.c

Merge reason: resolve the conflict.

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

cc0104e877fff32865a67b256d3a9ce52ff15790