Merge branch 'perf/core' into oprofile/master

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

    commit d41fc26fd91f34a8ea65e4f480a6dd5769470b93
    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>

diff --cc arch/x86/oprofile/nmi_int.c
Simple merge