From: Ingo Molnar <mingo@elte.hu>
Date: Wed, 22 Sep 2010 16:45:01 +0000 (+0200)
Subject: Merge branch 'linus' into perf/core
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=90edf27fb89241917e91155bfdcc7c8e5a587222;p=mv-sheeva.git

Merge branch 'linus' into perf/core

Conflicts:
	kernel/hw_breakpoint.c

Merge reason: resolve the conflict.

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

90edf27fb89241917e91155bfdcc7c8e5a587222