From: Robert Richter <robert.richter@amd.com>
Date: Tue, 8 Nov 2011 14:52:15 +0000 (+0100)
Subject: Merge branch 'perf/core' into oprofile/master
X-Git-Tag: v3.3-rc1~51^2~40^2~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=de346b6949063aa040ef607943b072835294f4b3;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

Merge branch 'perf/core' into oprofile/master

Merge reason: Resolve conflicts with Don's NMI rework:

    commit 9c48f1c629ecfa114850c03f875c6691003214de
    Author: Don Zickus <dzickus@redhat.com>
    Date:   Fri Sep 30 15:06:21 2011 -0400
    x86, nmi: Wire up NMI handlers to new routines

Conflicts:
	arch/x86/oprofile/nmi_timer_int.c

Signed-off-by: Robert Richter <robert.richter@amd.com>
---

de346b6949063aa040ef607943b072835294f4b3