]> git.baikalelectronics.ru Git - kernel.git/commit
projects / kernel.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 1501e2a e04b43e)
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)
commite1fc5d80a4a30163e6ebf0e28c23625c3fcc90af
tree11f5a10b9ab41a10ea26bf8ab1f133b802e7559etree | snapshot
parent1501e2a3bb5149dc71ce782e331c64c1336bc3cdcommit | diff
parente04b43e06aa88939ade7263d3a060e8229d3daa9commit | diff
Merge branch 'perf/core' into oprofile/master

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

    commit e04b43e06aa88939ade7263d3a060e8229d3daa9
    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
Linux Kernel Source Tree.