diff options
| author |   Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:29:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:29:31 +0100 |
| commit | 7e3cbc3f774f31ecd88a51edae3d9377f60a4c00 (patch) | |
| tree | f5aa6a587ba2cf796d11c4e49682552580ba65a2 /arch/powerpc/sysdev/fsl_pci.c | |
| parent | x86: fix intel x86_64 llc_shared_map/cpu_llc_id anomolies (diff) | |
| parent | x86, bts: DS and BTS initialization (diff) | |
| download | linux-rng-7e3cbc3f774f31ecd88a51edae3d9377f60a4c00.tar.xz linux-rng-7e3cbc3f774f31ecd88a51edae3d9377f60a4c00.zip | |
Merge branch 'x86/ptrace' into x86/tsc
Conflicts:
arch/x86/kernel/cpu/intel.c
Diffstat (limited to 'arch/powerpc/sysdev/fsl_pci.c')
0 files changed, 0 insertions, 0 deletions