This fixes a bunch of conflicts prior to merging i915 tree.
Linux 3.18-rc7
Conflicts:
drivers/gpu/drm/exynos/exynos_drm_drv.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/intel_pm.c
drivers/gpu/drm/tegra/dc.c
| -rw-r--r-- | Documentation/devicetree/bindings/ata/sata_rcar.txt | 6 | |
| -rw-r--r-- | Documentation/devicetree/bindings/interrupt-controller/interrupts.txt | 4 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pci/pci.txt | 11 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/img,tz1090-pdc-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/img,tz1090-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/lantiq,falcon-pinumx.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/lantiq,xway-pinumx.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/nvidia,tegra20-pinmux.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl-sirf.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/pinctrl_spear.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,msm8960-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/pinctrl/qcom,msm8974-pinctrl.txt | 2 | |
| -rw-r--r-- | Documentation/devicetree/bindings/vendor-prefixes.txt | 5 | |
| -rw-r--r-- | Documentation/filesystems/overlayfs.txt | 2 | |
| -rw-r--r-- | Documentation/input/elantech.txt | 81 | |
| -rw-r--r-- | Documentation/networking/ip-sysctl.txt | 14 | |
| -rw-r--r-- | Documentation/networking/timestamping.txt | 2 | |
| -rw-r--r-- | MAINTAINERS | 42 | |
| -rw-r--r-- | Makefile | 7 | |
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 20 | |
| -rw-r--r-- | arch/arm/boot/dts/am335x-evm.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-gp-evm.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/am437x-sk-evm.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/am43x-epos-evm.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos5250-snow.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/exynos5250.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7740.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/r8a7790.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/sama5d31.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sama5d33.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sama5d34.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sama5d35.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sama5d36.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sama5d3xcm.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/sun6i-a31.dtsi | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra114-dalmore.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra114-roth.dts | 9 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra114-tn7.dts | 5 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra114.dtsi | 7 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra124-jetson-tk1.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra124-nyan-big.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra124-venice2.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra124.dtsi | 8 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-harmony.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-iris-512.dts | 5 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-medcom-wide.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-paz00.dts | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-seaboard.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-tamonten.dtsi | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-trimslice.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-ventana.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20-whistler.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra20.dtsi | 8 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra30-apalis-eval.dts | 4 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra30-beaver.dts | 1 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra30-cardhu.dtsi | 2 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 3 | |
| -rw-r--r-- | arch/arm/boot/dts/tegra30.dtsi | 8 | |
| -rw-r--r-- | arch/arm/configs/exynos_defconfig | 2 | |
| -rw-r--r-- | arch/arm/configs/multi_v7_defconfig | 1 | |
| -rw-r--r-- | arch/arm/include/asm/thread_info.h | 11 | |
| -rw-r--r-- | arch/arm/kernel/traps.c | 31 | |
| -rw-r--r-- | arch/arm/kvm/mmu.c | 10 | |
| -rw-r--r-- | arch/arm/mach-mvebu/board-v7.c | 2 | |
| -rw-r--r-- | arch/arm/mach-mvebu/coherency.c | 2 | |
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7740.c | 9 | |
| -rw-r--r-- | arch/arm/mach-shmobile/clock-r8a7790.c | 2 | |
| -rw-r--r-- | arch/arm/mach-shmobile/setup-sh73a0.c | 20 | |
| -rw-r--r-- | arch/arm/mach-tegra/irq.c | 22 | |
| -rw-r--r-- | arch/arm/mm/Kconfig | 1 | |
| -rw-r--r-- | arch/arm/mm/proc-v7.S | 2 | |
| -rw-r--r-- | arch/arm/mm/proc-xscale.S | 4 | |
| -rw-r--r-- | arch/arm/plat-orion/gpio.c | 36 | |
| -rw-r--r-- | arch/arm64/boot/dts/apm-storm.dtsi | 10 | |
| -rw-r--r-- | arch/arm64/include/asm/memory.h | 2 | |
| -rw-r--r-- | arch/arm64/kernel/efi-entry.S | 27 | |
| -rw-r--r-- | arch/arm64/kernel/insn.c | 5 | |
| -rw-r--r-- | arch/arm64/kvm/sys_regs.c | 9 | |
| -rw-r--r-- | arch/arm64/lib/clear_user.S | 2 | |
| -rw-r--r-- | arch/arm64/mm/mmu.c | 2 | |
| -rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 2 | |
| -rw-r--r-- | arch/mips/Kconfig | 14 | |
| -rw-r--r-- | arch/mips/include/asm/jump_label.h | 8 | |
| -rw-r--r-- | arch/mips/include/asm/mach-loongson/cpu-feature-overrides.h | 2 | |
| -rw-r--r-- | arch/mips/include/asm/mipsregs.h | 2 | |
| -rw-r--r-- | arch/mips/include/asm/r4kcache.h | 4 | |
| -rw-r--r-- | arch/mips/include/asm/uaccess.h | 18 | |
| -rw-r--r-- | arch/mips/include/uapi/asm/unistd.h | 2 | |
| -rw-r--r-- | arch/mips/kernel/bmips_vec.S | 3 | |
| -rw-r--r-- | arch/mips/kernel/cps-vec.S | 2 | |
| -rw-r--r-- | arch/mips/kernel/cpu-probe.c | 40 | |
| -rw-r--r-- | arch/mips/kernel/jump_label.c | 42 | |
| -rw-r--r-- | arch/mips/kernel/rtlx.c | 4 | |
| -rw-r--r-- | arch/mips/kernel/setup.c | 4 | |
| -rw-r--r-- | arch/mips/kernel/signal.c | 8 | |
| -rw-r--r-- | arch/mips/lib/memcpy.S | 1 | |
| -rw-r--r-- | arch/mips/loongson/common/Makefile | 3 | |
| -rw-r--r-- | arch/mips/loongson/loongson-3/numa.c | 1 | |
| -rw-r--r-- | arch/mips/mm/tlb-r4k.c | 4 | |
| -rw-r--r-- | arch/mips/mm/tlbex.c | 10 | |
| -rw-r--r-- | arch/mips/mti-sead3/sead3-leds.c | 8 | |
| -rw-r--r-- | arch/mips/netlogic/xlp/Makefile | 12 | |
| -rw-r--r-- | arch/mips/oprofile/backtrace.c | 2 | |
| -rw-r--r-- | arch/mips/sgi-ip27/ip27-memory.c | 1 | |
| -rw-r--r-- | arch/parisc/include/asm/uaccess.h | 19 | |
| -rw-r--r-- | arch/parisc/include/uapi/asm/bitsperlong.h | 8 | |
| -rw-r--r-- | arch/parisc/include/uapi/asm/msgbuf.h | 8 | |
| -rw-r--r-- | arch/parisc/include/uapi/asm/sembuf.h | 6 | |
| -rw-r--r-- | arch/parisc/include/uapi/asm/shmbuf.h | 35 | |
| -rw-r--r-- | arch/parisc/include/uapi/asm/signal.h | 2 | |
| -rw-r--r-- | arch/parisc/include/uapi/asm/unistd.h | 3 | |
| -rw-r--r-- | arch/parisc/kernel/syscall_table.S | 9 | |
| -rw-r--r-- | arch/powerpc/include/asm/pci-bridge.h | 2 | |
| -rw-r--r-- | arch/powerpc/kernel/eeh_sysfs.c | 2 | |
| -rw-r--r-- | arch/powerpc/kernel/pci_64.c | 10 | |
| -rw-r--r-- | arch/powerpc/kernel/vdso32/getcpu.S | 4 | |
| -rw-r--r-- | arch/powerpc/platforms/powernv/opal-hmi.c | 2 | |
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci-ioda.c | 5 | |
| -rw-r--r-- | arch/powerpc/platforms/powernv/pci.c | 3 | |
| -rw-r--r-- | arch/powerpc/platforms/pseries/msi.c | 2 | |
| -rw-r--r-- | arch/powerpc/sysdev/fsl_msi.c | 2 | |
| -rw-r--r-- | arch/powerpc/xmon/xmon.c | 6 | |
| -rw-r--r-- | arch/sparc/include/asm/atomic_32.h | 2 | |
| -rw-r--r-- | arch/sparc/include/asm/cmpxchg_32.h | 12 | |
| -rw-r--r-- | arch/sparc/include/asm/dma-mapping.h | 8 | |
| -rw-r--r-- | arch/sparc/include/uapi/asm/swab.h | 12 | |
| -rw-r--r-- | arch/sparc/kernel/pci_schizo.c | 6 | |
| -rw-r--r-- | arch/sparc/kernel/smp_64.c | 4 | |
| -rw-r--r-- | arch/sparc/lib/atomic32.c | 27 | |
| -rw-r--r-- | arch/x86/Kconfig | 2 | |
| -rw-r--r-- | arch/x86/boot/compressed/Makefile | 4 | |
| -rw-r--r-- | arch/x86/boot/compressed/head_32.S | 5 | |
