Merge branch 'linus' into perf/core
Merge reason: Pick up perf fixes that are now upstream
Signed-off-by:
Ingo Molnar <mingo@elte.hu>
Showing
- Documentation/feature-removal-schedule.txt 16 additions, 0 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/networking/ip-sysctl.txt 1 addition, 1 deletionDocumentation/networking/ip-sysctl.txt
- Documentation/scheduler/sched-stats.txt 15 additions, 18 deletionsDocumentation/scheduler/sched-stats.txt
- Documentation/sound/alsa/HD-Audio-Models.txt 1 addition, 0 deletionsDocumentation/sound/alsa/HD-Audio-Models.txt
- MAINTAINERS 16 additions, 13 deletionsMAINTAINERS
- arch/arm/mach-ixp4xx/common.c 2 additions, 2 deletionsarch/arm/mach-ixp4xx/common.c
- arch/arm/mach-ixp4xx/include/mach/timex.h 3 additions, 2 deletionsarch/arm/mach-ixp4xx/include/mach/timex.h
- arch/arm/mach-ixp4xx/ixp4xx_qmgr.c 5 additions, 4 deletionsarch/arm/mach-ixp4xx/ixp4xx_qmgr.c
- arch/m32r/kernel/irq.c 1 addition, 1 deletionarch/m32r/kernel/irq.c
- arch/microblaze/kernel/head.S 12 additions, 2 deletionsarch/microblaze/kernel/head.S
- arch/microblaze/kernel/hw_exception_handler.S 0 additions, 4 deletionsarch/microblaze/kernel/hw_exception_handler.S
- arch/microblaze/lib/fastcopy.S 4 additions, 0 deletionsarch/microblaze/lib/fastcopy.S
- arch/s390/Kconfig 1 addition, 1 deletionarch/s390/Kconfig
- arch/s390/include/asm/cacheflush.h 1 addition, 22 deletionsarch/s390/include/asm/cacheflush.h
- arch/s390/include/asm/tlb.h 1 addition, 0 deletionsarch/s390/include/asm/tlb.h
- arch/s390/lib/uaccess_std.c 4 additions, 6 deletionsarch/s390/lib/uaccess_std.c
- arch/s390/mm/pgtable.c 2 additions, 1 deletionarch/s390/mm/pgtable.c
- arch/x86/include/asm/mmu_context.h 3 additions, 2 deletionsarch/x86/include/asm/mmu_context.h
- arch/x86/include/asm/smp.h 1 addition, 4 deletionsarch/x86/include/asm/smp.h
- arch/x86/kernel/acpi/sleep.c 1 addition, 1 deletionarch/x86/kernel/acpi/sleep.c
Loading
Please register or sign in to comment