diff options
| author | Ingo Molnar <[email protected]> | 2008-12-25 11:48:18 +0000 |
|---|---|---|
| committer | Ingo Molnar <[email protected]> | 2008-12-25 11:48:18 +0000 |
| commit | a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5 (patch) | |
| tree | 28eedba6d432e9d9d772962e6f92732aef1be065 /drivers/pci/hotplug/ibmphp_core.c | |
| parent | Merge branches 'tracing/ftrace', 'tracing/ring-buffer' and 'tracing/urgent' i... (diff) | |
| parent | Merge branch 'x86/ptrace' into x86/tsc (diff) | |
| download | kernel-a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5.tar.gz kernel-a3eeeefbf1cd1d142c52238cc19c75d14c3bc8d5.zip | |
Merge branch 'x86/tsc' into tracing/core
Merge it to resolve this incidental conflict between the BTS fixes/cleanups
and changes in x86/tsc:
Conflicts:
arch/x86/kernel/cpu/intel.c
Diffstat (limited to 'drivers/pci/hotplug/ibmphp_core.c')
0 files changed, 0 insertions, 0 deletions