Merge branch 'x86/apic' into perfcounters/core
Conflicts: arch/x86/kernel/cpu/perfctr-watchdog.c
Showing
- Documentation/connector/cn_test.c 2 additions, 4 deletionsDocumentation/connector/cn_test.c
- Makefile 1 addition, 1 deletionMakefile
- arch/alpha/include/asm/statfs.h 2 additions, 0 deletionsarch/alpha/include/asm/statfs.h
- arch/alpha/include/asm/swab.h 1 addition, 1 deletionarch/alpha/include/asm/swab.h
- arch/arm/include/asm/a.out.h 1 addition, 1 deletionarch/arm/include/asm/a.out.h
- arch/arm/include/asm/setup.h 1 addition, 1 deletionarch/arm/include/asm/setup.h
- arch/arm/include/asm/swab.h 1 addition, 1 deletionarch/arm/include/asm/swab.h
- arch/avr32/include/asm/swab.h 1 addition, 1 deletionarch/avr32/include/asm/swab.h
- arch/blackfin/include/asm/swab.h 1 addition, 1 deletionarch/blackfin/include/asm/swab.h
- arch/h8300/include/asm/swab.h 1 addition, 1 deletionarch/h8300/include/asm/swab.h
- arch/ia64/include/asm/fpu.h 0 additions, 2 deletionsarch/ia64/include/asm/fpu.h
- arch/ia64/include/asm/gcc_intrin.h 1 addition, 0 deletionsarch/ia64/include/asm/gcc_intrin.h
- arch/ia64/include/asm/intrinsics.h 1 addition, 0 deletionsarch/ia64/include/asm/intrinsics.h
- arch/ia64/include/asm/kvm.h 1 addition, 2 deletionsarch/ia64/include/asm/kvm.h
- arch/ia64/include/asm/swab.h 1 addition, 1 deletionarch/ia64/include/asm/swab.h
- arch/ia64/kernel/acpi.c 1 addition, 1 deletionarch/ia64/kernel/acpi.c
- arch/mips/include/asm/sigcontext.h 1 addition, 0 deletionsarch/mips/include/asm/sigcontext.h
- arch/mips/include/asm/swab.h 1 addition, 1 deletionarch/mips/include/asm/swab.h
- arch/parisc/include/asm/pdc.h 2 additions, 1 deletionarch/parisc/include/asm/pdc.h
- arch/parisc/include/asm/swab.h 1 addition, 1 deletionarch/parisc/include/asm/swab.h
Loading
Please register or sign in to comment