From: Matt Fleming <matt@console-pimps.org>
Date: Mon, 13 Sep 2010 19:17:29 +0000 (+0100)
Subject: perf, sh: Fix patch merge foul-up
X-Git-Tag: v2.6.37-rc1~214^2~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=64a48d90149bb7007275fac13eaa4cb8d8ce12ea;p=pandora-kernel.git

perf, sh: Fix patch merge foul-up

3f6da390 ("perf: Rework and fix the arch CPU-hotplug hooks") introduced
this breakage. sh_pmu_setup() is missing an opening curly brace.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <20100913191729.GA6440@console-pimps.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

Reading git-diff-tree failed