We don't like this, but things have diverged with the blk-mq fixes
in 3.15-rc1. So merge it in.
| -rw-r--r-- | Documentation/ABI/testing/sysfs-block-zram | 39 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-devices-power | 46 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-fs-f2fs | 12 | |
| -rw-r--r-- | Documentation/ABI/testing/sysfs-module | 1 | |
| -rw-r--r-- | Documentation/DocBook/Makefile | 25 | |
| -rw-r--r-- | Documentation/DocBook/drm.tmpl | 550 | |
| -rw-r--r-- | Documentation/DocBook/kernel-hacking.tmpl | 12 | |
| -rw-r--r-- | Documentation/arm64/booting.txt | 10 | |
| -rw-r--r-- | Documentation/arm64/memory.txt | 4 | |
| -rw-r--r-- | Documentation/blockdev/zram.txt | 54 | |
| -rw-r--r-- | Documentation/cgroups/memcg_test.txt | 4 | |
| -rw-r--r-- | Documentation/cgroups/resource_counter.txt | 12 | |
| -rw-r--r-- | Documentation/cpu-hotplug.txt | 45 | |
| -rw-r--r-- | Documentation/devicetree/bindings/arm/topology.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/fsl-edma.txt | 76 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/qcom_bam_dma.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/dma/sirfsoc-dma.txt | 43 | |
| -rw-r--r-- | Documentation/devicetree/bindings/drm/bridge/ptn3460.txt | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/drm/i2c/tda998x.txt | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt | 42 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-at91.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-cadence.txt | 24 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-designware.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-efm32.txt | 34 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-mv64xxx.txt | 20 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-rcar.txt | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/i2c/qcom,i2c-qup.txt | 40 | |
| -rw-r--r-- | Documentation/devicetree/bindings/iio/adc/twl4030-madc.txt | 24 | |
| -rw-r--r-- | Documentation/devicetree/bindings/leds/leds-gpio.txt | 12 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/arizona.txt | 23 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/bcm590xx.txt | 37 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/da9055.txt | 72 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/mc13xxx.txt | 47 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/omap-usb-host.txt | 23 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/omap-usb-tll.txt | 10 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/qcom,pm8xxx.txt | 96 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mfd/s2mps11.txt | 24 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/mmc.txt | 9 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/sdhci-msm.txt | 55 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/sdhci-pxa.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mmc/ti-omap-hsmmc.txt | 1 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/nand.txt | 14 | |
| -rw-r--r-- | Documentation/devicetree/bindings/mtd/st-fsm.txt | 26 | |
| -rw-r--r-- | Documentation/devicetree/bindings/panel/lg,ld070wx3-sl01.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/panel/lg,lh500wx1-sd03.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/panel/lg,lp129qe.txt | 7 | |
| -rw-r--r-- | Documentation/devicetree/bindings/panel/samsung,ld9040.txt | 66 | |
| -rw-r--r-- | Documentation/devicetree/bindings/panel/samsung,s6e8aa0.txt | 56 | |
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/pbias-regulator.txt | 27 | |
| -rw-r--r-- | Documentation/devicetree/bindings/sound/fsl,ssi.txt | 21 | |
| -rw-r--r-- | Documentation/devicetree/bindings/spi/efm32-spi.txt | 8 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/analog-tv-connector.txt | 25 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/backlight/gpio-backlight.txt | 16 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/dvi-connector.txt | 35 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/exynos_dp.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/exynos_dsim.txt | 80 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/exynos_hdmi.txt | 5 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/hdmi-connector.txt | 28 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/panel-dsi-cm.txt | 29 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/samsung-fimd.txt | 17 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/sony,acx565akm.txt | 30 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/ti,omap-dss.txt | 211 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/ti,omap2-dss.txt | 54 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/ti,omap3-dss.txt | 83 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/ti,omap4-dss.txt | 111 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/ti,tfp410.txt | 41 | |
| -rw-r--r-- | Documentation/devicetree/bindings/video/ti,tpd12s015.txt | 44 | |
| -rw-r--r-- | Documentation/dontdiff | 3 | |
| -rw-r--r-- | Documentation/filesystems/Locking | 12 | |
| -rw-r--r-- | Documentation/filesystems/affs.txt | 9 | |
| -rw-r--r-- | Documentation/filesystems/f2fs.txt | 29 | |
| -rw-r--r-- | Documentation/filesystems/proc.txt | 17 | |
| -rw-r--r-- | Documentation/filesystems/vfs.txt | 2 | |
| -rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 1 | |
| -rw-r--r-- | Documentation/i2c/functionality | 2 | |
| -rw-r--r-- | Documentation/i2c/i2c-protocol | 35 | |
| -rw-r--r-- | Documentation/irqflags-tracing.txt | 7 | |
| -rw-r--r-- | Documentation/kbuild/kconfig-language.txt | 4 | |
| -rw-r--r-- | Documentation/kernel-parameters.txt | 12 | |
| -rw-r--r-- | Documentation/module-signing.txt | 3 | |
| -rw-r--r-- | Documentation/oops-tracing.txt | 3 | |
| -rw-r--r-- | Documentation/rapidio/sysfs.txt | 66 | |
| -rw-r--r-- | Documentation/scheduler/sched-arch.txt | 2 | |
| -rw-r--r-- | Documentation/sysctl/kernel.txt | 3 | |
| -rw-r--r-- | MAINTAINERS | 26 | |
| -rw-r--r-- | Makefile | 51 | |
| -rw-r--r-- | arch/alpha/Kconfig | 1 | |
| -rw-r--r-- | arch/arc/Kconfig | 2 | |
| -rw-r--r-- | arch/arc/boot/.gitignore | 1 | |
| -rw-r--r-- | arch/arc/boot/dts/nsimosci.dts | 12 | |
| -rw-r--r-- | arch/arc/boot/dts/skeleton.dts | 10 | |
| -rw-r--r-- | arch/arc/configs/nsimosci_defconfig | 1 | |
| -rw-r--r-- | arch/arc/include/asm/linkage.h | 14 | |
| -rw-r--r-- | arch/arc/kernel/ctx_sw_asm.S | 2 | |
| -rw-r--r-- | arch/arc/kernel/entry.S | 52 | |
| -rw-r--r-- | arch/arc/kernel/head.S | 7 | |
| -rw-r--r-- | arch/arc/kernel/time.c | 37 | |
| -rw-r--r-- | arch/arc/lib/memcmp.S | 6 | |
| -rw-r--r-- | arch/arc/lib/memcpy-700.S | 6 | |
| -rw-r--r-- | arch/arc/lib/memset.S | 10 | |
| -rw-r--r-- | arch/arc/lib/strchr-700.S | 6 | |
| -rw-r--r-- | arch/arc/lib/strcmp.S | 6 | |
| -rw-r--r-- | arch/arc/lib/strcpy-700.S | 6 | |
| -rw-r--r-- | arch/arc/lib/strlen.S | 6 | |
| -rw-r--r-- | arch/arc/mm/cache_arc700.c | 3 | |
| -rw-r--r-- | arch/arc/mm/init.c | 27 | |
| -rw-r--r-- | arch/arc/mm/tlbex.S | 10 | |
| -rw-r--r-- | arch/arc/plat-arcfpga/Kconfig | 1 | |
| -rw-r--r-- | arch/arc/plat-arcfpga/platform.c | 6 | |
| -rw-r--r-- | arch/arm/Kconfig | 13 | |
| -rw-r--r-- | arch/arm/boot/dts/atlas6.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/dra7.dtsi | 17 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos4.dtsi | 14 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos4210-trats.dts | 61 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos4210-universal_c210.dts | 64 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos4412-trats2.dts | 70 | |
| -rw-r--r-- | arch/arm/boot/dts/omap2.dtsi | 31 | |
| -rw-r--r-- | arch/arm/boot/dts/omap2430.dtsi | 17 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-beagle-xm.dts | 138 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-beagle.dts | 135 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-igep0020.dts | 58 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-ldp.dts | 23 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3-n900.dts | 77 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3.dtsi | 69 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3430es1-clocks.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/omap36xx-am35xx-omap3430es2plus-clocks.dtsi | 6 | |
| -rw-r--r-- | arch/arm/boot/dts/omap36xx-clocks.dtsi | 20 | |
| -rw-r--r-- | arch/arm/boot/dts/omap36xx.dtsi | 8 | |
| -rw-r--r-- | arch/arm/boot/dts/omap3xxx-clocks.dtsi | 8 | |
| -rw-r--r-- | |
