Merge 3.14-rc3 into usb-next

We want the fixes in this branch as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2026-10-16 22:39:48 +00:00 · 2014-02-18 09:27:12 -08:00 · 2014-02-18 09:27:12 -08:00 · 9d265649a8
commit 9d265649a8
parent 6d36b6f313 6d0abeca32
720 changed files with 9464 additions and 4239 deletions
--- a/.gitignore
+++ b/.gitignore
--- a/Documentation/00-INDEX
+++ b/Documentation/00-INDEX
--- a/Documentation/ABI/testing/sysfs-tty
+++ b/Documentation/ABI/testing/sysfs-tty
--- a/Documentation/RCU/00-INDEX
+++ b/Documentation/RCU/00-INDEX
--- a/Documentation/arm/00-INDEX
+++ b/Documentation/arm/00-INDEX
--- a/Documentation/blackfin/00-INDEX
+++ b/Documentation/blackfin/00-INDEX
--- a/Documentation/block/00-INDEX
+++ b/Documentation/block/00-INDEX
--- a/Documentation/devicetree/00-INDEX
+++ b/Documentation/devicetree/00-INDEX
--- a/Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.txt
+++ b/Documentation/devicetree/bindings/interrupt-controller/lsi,zevio-intc.txt
--- a/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
+++ b/Documentation/devicetree/bindings/mmc/atmel-hsmci.txt
--- a/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
+++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-emac.txt
--- a/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
+++ b/Documentation/devicetree/bindings/net/allwinner,sun4i-mdio.txt
--- a/Documentation/devicetree/bindings/power/bq2415x.txt
+++ b/Documentation/devicetree/bindings/power/bq2415x.txt
--- a/Documentation/devicetree/bindings/spi/spi_atmel.txt
+++ b/Documentation/devicetree/bindings/spi/spi_atmel.txt
--- a/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
--- a/Documentation/dvb/contributors.txt
+++ b/Documentation/dvb/contributors.txt
--- a/Documentation/fb/00-INDEX
+++ b/Documentation/fb/00-INDEX
--- a/Documentation/filesystems/00-INDEX
+++ b/Documentation/filesystems/00-INDEX
--- a/Documentation/filesystems/nfs/00-INDEX
+++ b/Documentation/filesystems/nfs/00-INDEX
--- a/Documentation/i2c/instantiating-devices
+++ b/Documentation/i2c/instantiating-devices
--- a/Documentation/ide/00-INDEX
+++ b/Documentation/ide/00-INDEX
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
--- a/Documentation/laptops/00-INDEX
+++ b/Documentation/laptops/00-INDEX
--- a/Documentation/leds/00-INDEX
+++ b/Documentation/leds/00-INDEX
--- a/Documentation/m68k/00-INDEX
+++ b/Documentation/m68k/00-INDEX
--- a/Documentation/networking/00-INDEX
+++ b/Documentation/networking/00-INDEX
--- a/Documentation/phy.txt
+++ b/Documentation/phy.txt
--- a/Documentation/power/00-INDEX
+++ b/Documentation/power/00-INDEX
--- a/Documentation/ptp/testptp.c
+++ b/Documentation/ptp/testptp.c
--- a/Documentation/s390/00-INDEX
+++ b/Documentation/s390/00-INDEX
--- a/Documentation/scheduler/00-INDEX
+++ b/Documentation/scheduler/00-INDEX
--- a/Documentation/scsi/00-INDEX
+++ b/Documentation/scsi/00-INDEX
--- a/Documentation/serial/00-INDEX
+++ b/Documentation/serial/00-INDEX
--- a/Documentation/spi/00-INDEX
+++ b/Documentation/spi/00-INDEX
--- a/Documentation/spi/spi-summary
+++ b/Documentation/spi/spi-summary
--- a/Documentation/timers/00-INDEX
+++ b/Documentation/timers/00-INDEX
--- a/Documentation/virtual/kvm/00-INDEX
+++ b/Documentation/virtual/kvm/00-INDEX
--- a/Documentation/vm/00-INDEX
+++ b/Documentation/vm/00-INDEX
--- a/Documentation/w1/masters/00-INDEX
+++ b/Documentation/w1/masters/00-INDEX
--- a/Documentation/w1/slaves/00-INDEX
+++ b/Documentation/w1/slaves/00-INDEX
--- a/Documentation/x86/00-INDEX
+++ b/Documentation/x86/00-INDEX
--- a/Documentation/zh_CN/arm64/booting.txt
+++ b/Documentation/zh_CN/arm64/booting.txt
--- a/Documentation/zh_CN/arm64/memory.txt
+++ b/Documentation/zh_CN/arm64/memory.txt
--- a/Documentation/zh_CN/arm64/tagged-pointers.txt
+++ b/Documentation/zh_CN/arm64/tagged-pointers.txt
--- a/6
+++ b/6
--- a/2
+++ b/2
--- a/arch/arm/boot/dts/Makefile
+++ b/arch/arm/boot/dts/Makefile
--- a/arch/arm/boot/dts/at91-sama5d3_xplained.dts
+++ b/arch/arm/boot/dts/at91-sama5d3_xplained.dts
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
--- a/arch/arm/boot/dts/at91sam9n12ek.dts
+++ b/arch/arm/boot/dts/at91sam9n12ek.dts
--- a/arch/arm/boot/dts/sama5d3.dtsi
+++ b/arch/arm/boot/dts/sama5d3.dtsi
--- a/arch/arm/boot/dts/ste-href.dtsi
+++ b/arch/arm/boot/dts/ste-href.dtsi
--- a/arch/arm/boot/dts/sun4i-a10.dtsi
+++ b/arch/arm/boot/dts/sun4i-a10.dtsi
--- a/arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/arch/arm/boot/dts/sun5i-a10s.dtsi
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
--- a/arch/arm/mach-hisi/Kconfig
+++ b/arch/arm/mach-hisi/Kconfig
--- a/arch/arm/mach-imx/clk-imx6q.c
+++ b/arch/arm/mach-imx/clk-imx6q.c
--- a/arch/arm/mach-imx/clk-imx6sl.c
+++ b/arch/arm/mach-imx/clk-imx6sl.c
--- a/arch/arm/mach-imx/pm-imx6q.c
+++ b/arch/arm/mach-imx/pm-imx6q.c
--- a/arch/arm/mach-moxart/Kconfig
+++ b/arch/arm/mach-moxart/Kconfig
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
--- a/arch/arm/mach-pxa/am300epd.c
+++ b/arch/arm/mach-pxa/am300epd.c
--- a/arch/arm/mach-pxa/include/mach/balloon3.h
+++ b/arch/arm/mach-pxa/include/mach/balloon3.h
--- a/arch/arm/mach-pxa/include/mach/corgi.h
+++ b/arch/arm/mach-pxa/include/mach/corgi.h
--- a/arch/arm/mach-pxa/include/mach/csb726.h
+++ b/arch/arm/mach-pxa/include/mach/csb726.h
--- a/arch/arm/mach-pxa/include/mach/gumstix.h
+++ b/arch/arm/mach-pxa/include/mach/gumstix.h
--- a/arch/arm/mach-pxa/include/mach/idp.h
+++ b/arch/arm/mach-pxa/include/mach/idp.h
--- a/arch/arm/mach-pxa/include/mach/palmld.h
+++ b/arch/arm/mach-pxa/include/mach/palmld.h
--- a/arch/arm/mach-pxa/include/mach/palmt5.h
+++ b/arch/arm/mach-pxa/include/mach/palmt5.h
--- a/arch/arm/mach-pxa/include/mach/palmtc.h
+++ b/arch/arm/mach-pxa/include/mach/palmtc.h
--- a/arch/arm/mach-pxa/include/mach/palmtx.h
+++ b/arch/arm/mach-pxa/include/mach/palmtx.h
--- a/arch/arm/mach-pxa/include/mach/pcm027.h
+++ b/arch/arm/mach-pxa/include/mach/pcm027.h
--- a/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
+++ b/arch/arm/mach-pxa/include/mach/pcm990_baseboard.h
--- a/arch/arm/mach-pxa/include/mach/poodle.h
+++ b/arch/arm/mach-pxa/include/mach/poodle.h
--- a/arch/arm/mach-pxa/include/mach/spitz.h
+++ b/arch/arm/mach-pxa/include/mach/spitz.h
--- a/arch/arm/mach-pxa/include/mach/tosa.h
+++ b/arch/arm/mach-pxa/include/mach/tosa.h
--- a/arch/arm/mach-pxa/include/mach/trizeps4.h
+++ b/arch/arm/mach-pxa/include/mach/trizeps4.h
--- a/arch/arm/mach-shmobile/Kconfig
+++ b/arch/arm/mach-shmobile/Kconfig
--- a/arch/arm/mach-zynq/common.c
+++ b/arch/arm/mach-zynq/common.c
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
--- a/arch/arm64/configs/defconfig
+++ b/arch/arm64/configs/defconfig
--- a/arch/arm64/include/asm/atomic.h
+++ b/arch/arm64/include/asm/atomic.h
--- a/arch/arm64/include/asm/barrier.h
+++ b/arch/arm64/include/asm/barrier.h
--- a/arch/arm64/include/asm/cacheflush.h
+++ b/arch/arm64/include/asm/cacheflush.h
--- a/arch/arm64/include/asm/cmpxchg.h
+++ b/arch/arm64/include/asm/cmpxchg.h
--- a/arch/arm64/include/asm/esr.h
+++ b/arch/arm64/include/asm/esr.h
--- a/arch/arm64/include/asm/futex.h
+++ b/arch/arm64/include/asm/futex.h
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
--- a/arch/arm64/include/asm/spinlock.h
+++ b/arch/arm64/include/asm/spinlock.h
--- a/arch/arm64/include/asm/unistd32.h
+++ b/arch/arm64/include/asm/unistd32.h
--- a/arch/arm64/include/uapi/asm/kvm.h
+++ b/arch/arm64/include/uapi/asm/kvm.h
--- a/arch/arm64/kernel/kuser32.S
+++ b/arch/arm64/kernel/kuser32.S
--- a/arch/arm64/kernel/vdso.c
+++ b/arch/arm64/kernel/vdso.c
--- a/arch/arm64/kernel/vdso/Makefile
+++ b/arch/arm64/kernel/vdso/Makefile
--- a/arch/arm64/kernel/vdso/gettimeofday.S
+++ b/arch/arm64/kernel/vdso/gettimeofday.S
--- a/arch/arm64/lib/bitops.S
+++ b/arch/arm64/lib/bitops.S
--- a/arch/arm64/mm/dma-mapping.c
+++ b/arch/arm64/mm/dma-mapping.c
--- a/arch/arm64/mm/mmu.c
+++ b/arch/arm64/mm/mmu.c
--- a/arch/arm64/mm/pgd.c
+++ b/arch/arm64/mm/pgd.c
--- a/Show more
+++ b/Show more