Merge branch 'sched/core' into cpus4096
Conflicts: include/linux/ftrace.h kernel/sched.c
Showing
- Documentation/local_ops.txt 1 addition, 1 deletionDocumentation/local_ops.txt
- MAINTAINERS 9 additions, 0 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/include/asm/bitops.h 10 additions, 6 deletionsarch/arm/include/asm/bitops.h
- arch/arm/include/asm/processor.h 1 addition, 1 deletionarch/arm/include/asm/processor.h
- arch/arm/mach-omap1/io.c 1 addition, 1 deletionarch/arm/mach-omap1/io.c
- arch/arm/mm/alignment.c 23 additions, 3 deletionsarch/arm/mm/alignment.c
- arch/arm/plat-omap/include/mach/omapfb.h 2 additions, 2 deletionsarch/arm/plat-omap/include/mach/omapfb.h
- arch/arm/plat-omap/sram.c 4 additions, 4 deletionsarch/arm/plat-omap/sram.c
- arch/arm/plat-orion/pcie.c 1 addition, 1 deletionarch/arm/plat-orion/pcie.c
- arch/ia64/configs/generic_defconfig 147 additions, 71 deletionsarch/ia64/configs/generic_defconfig
- arch/ia64/include/asm/paravirt_privop.h 0 additions, 1 deletionarch/ia64/include/asm/paravirt_privop.h
- arch/ia64/kernel/topology.c 3 additions, 1 deletionarch/ia64/kernel/topology.c
- arch/ia64/sn/kernel/irq.c 8 additions, 1 deletionarch/ia64/sn/kernel/irq.c
- arch/ia64/sn/kernel/setup.c 3 additions, 6 deletionsarch/ia64/sn/kernel/setup.c
- arch/mips/configs/fulong_defconfig 537 additions, 384 deletionsarch/mips/configs/fulong_defconfig
- arch/mips/configs/ip22_defconfig 339 additions, 179 deletionsarch/mips/configs/ip22_defconfig
- arch/mips/configs/malta_defconfig 422 additions, 209 deletionsarch/mips/configs/malta_defconfig
- arch/mips/include/asm/pci.h 5 additions, 0 deletionsarch/mips/include/asm/pci.h
- arch/mips/kernel/scall32-o32.S 2 additions, 5 deletionsarch/mips/kernel/scall32-o32.S
Loading
Please register or sign in to comment