]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
projects / mirror_ubuntu-kernels.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: dcfce4a 9c48f1c)
Merge branch 'perf/core' into oprofile/master
authorRobert Richter <robert.richter@amd.com>
Tue, 8 Nov 2011 14:52:15 +0000 (15:52 +0100)
committerRobert Richter <robert.richter@amd.com>
Tue, 8 Nov 2011 14:52:15 +0000 (15:52 +0100)
commitde346b6949063aa040ef607943b072835294f4b3
tree11f5a10b9ab41a10ea26bf8ab1f133b802e7559etree
parentdcfce4a095932e6e95d83ad982be3609947963bccommit | diff
parent9c48f1c629ecfa114850c03f875c6691003214decommit | diff
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>
arch/x86/oprofile/nmi_int.c diff1 | diff2 | blob | history
Ubuntu combined Linux kernel mirror