diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:20:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-10 08:20:51 +0200 |
| commit | 81faaae45701484bd7368336e02f2a846153b22f (patch) | |
| tree | d7d8dcafe5bb22decb0024537478fb667b0c896b /arch/arm/configs/sx1_defconfig | |
| parent | x86: little clean up of intel.c/intel_64.c (diff) | |
| parent | x86: fix ds.c build error (diff) | |
| download | linux-81faaae45701484bd7368336e02f2a846153b22f.tar.xz linux-81faaae45701484bd7368336e02f2a846153b22f.zip | |
Merge branch 'x86/pebs' into x86/unify-cpu-detect
Conflicts:
arch/x86/Kconfig.cpu
include/asm-x86/ds.h
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/configs/sx1_defconfig')
0 files changed, 0 insertions, 0 deletions