Conflicts:
drivers/infiniband/hw/cxgb4/device.c
The cxgb4 conflict was simply overlapping changes.
Signed-off-by: 
David S. Miller <davem@davemloft.net>
Showing
- Documentation/acpi/enumeration.txt 0 additions, 6 deletionsDocumentation/acpi/enumeration.txt
- Documentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt 4 additions, 2 deletionsDocumentation/devicetree/bindings/cpufreq/cpufreq-cpu0.txt
- Documentation/kernel-parameters.txt 7 additions, 1 deletionDocumentation/kernel-parameters.txt
- MAINTAINERS 10 additions, 0 deletionsMAINTAINERS
- Makefile 1 addition, 1 deletionMakefile
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/arm/boot/dts/at91sam9n12.dtsi 1 addition, 1 deletionarch/arm/boot/dts/at91sam9n12.dtsi
- arch/arm/boot/dts/at91sam9x5.dtsi 2 additions, 2 deletionsarch/arm/boot/dts/at91sam9x5.dtsi
- arch/arm/mach-exynos/hotplug.c 6 additions, 4 deletionsarch/arm/mach-exynos/hotplug.c
- arch/arm/mach-exynos/platsmp.c 19 additions, 15 deletionsarch/arm/mach-exynos/platsmp.c
- arch/arm/mach-imx/clk-imx6q.c 2 additions, 2 deletionsarch/arm/mach-imx/clk-imx6q.c
- arch/arm/mach-mvebu/coherency.c 5 additions, 1 deletionarch/arm/mach-mvebu/coherency.c
- arch/arm/mach-mvebu/headsmp-a9.S 8 additions, 1 deletionarch/arm/mach-mvebu/headsmp-a9.S
- arch/arm/mach-mvebu/pmsu.c 5 additions, 5 deletionsarch/arm/mach-mvebu/pmsu.c
- arch/arm64/Kconfig 1 addition, 0 deletionsarch/arm64/Kconfig
- arch/arm64/kernel/efi-stub.c 0 additions, 2 deletionsarch/arm64/kernel/efi-stub.c
- arch/powerpc/Kconfig 1 addition, 0 deletionsarch/powerpc/Kconfig
- arch/powerpc/include/asm/kvm_book3s_64.h 17 additions, 2 deletionsarch/powerpc/include/asm/kvm_book3s_64.h
- arch/powerpc/include/asm/ppc_asm.h 2 additions, 0 deletionsarch/powerpc/include/asm/ppc_asm.h
- arch/powerpc/kvm/book3s_64_mmu_hv.c 1 addition, 1 deletionarch/powerpc/kvm/book3s_64_mmu_hv.c
Loading
Please register or sign in to comment