Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Browse source

Backmerge because:
- Maarten needs latest atomic patches from drm-misc.
- Lionel needs the color manager core patch from drm-misc.
- Ander extracted intel_dpll_mgr.c, we need a backmerge to avoid git
  losing track of things too often (right now it seems ok due to
  cherry-picks).
- Tvrtko needs a stable baseline to apply some large-scale renaming
  patches to i915 GEM code.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

...

This commit is contained in:

Daniel Vetter 2016-03-16 08:11:09 +01:00

parent 359d224311 86d65b7e7a

commit 31fa684096

1855 changed files with 51959 additions and 33675 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1

Documentation/DocBook/device-drivers.tmpl

View file

59

Documentation/DocBook/gpu.tmpl

View file

58

Documentation/DocBook/media/v4l/controls.xml

View file

3

Documentation/DocBook/media/v4l/media-ioc-g-topology.xml

View file

33

Documentation/DocBook/media/v4l/media-types.xml

View file

26

Documentation/DocBook/media/v4l/pixfmt-yuv420m.xml

View file

114

Documentation/DocBook/media/v4l/pixfmt-yvu420m.xml → Documentation/DocBook/media/v4l/pixfmt-yuv422m.xml

View file

177

Documentation/DocBook/media/v4l/pixfmt-yuv444m.xml

View file

3

Documentation/DocBook/media/v4l/pixfmt.xml

View file

14

Documentation/DocBook/media/v4l/vidioc-query-dv-timings.xml

View file

10

Documentation/DocBook/media/v4l/vidioc-querystd.xml

View file

2

Documentation/cgroup-v2.txt

View file

1

Documentation/devicetree/bindings/arm/omap/omap.txt

View file

2

Documentation/devicetree/bindings/clock/rockchip,rk3036-cru.txt

View file

12

Documentation/devicetree/bindings/display/brcm,bcm-vc4.txt

View file

1

Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt

View file

3

Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt

View file

32

Documentation/devicetree/bindings/display/msm/dsi.txt

View file

46

Documentation/devicetree/bindings/display/msm/hdmi.txt

View file

16

Documentation/devicetree/bindings/display/renesas,du.txt

View file

50

Documentation/devicetree/bindings/display/rockchip/inno_hdmi-rockchip.txt

View file

5

Documentation/devicetree/bindings/interrupt-controller/arm,gic-v3.txt

View file

2

Documentation/devicetree/bindings/media/i2c/mt9v032.txt

View file

88

Documentation/devicetree/bindings/media/i2c/tvp5150.txt

View file

1

Documentation/devicetree/bindings/media/rcar_vin.txt

View file

13

Documentation/devicetree/bindings/media/renesas,jpu.txt

View file

34

Documentation/devicetree/bindings/media/renesas,vsp1.txt

View file

72

Documentation/devicetree/bindings/media/ti-cal.txt

View file

4

Documentation/devicetree/bindings/net/renesas,ravb.txt

View file

1

Documentation/devicetree/bindings/pci/pci-rcar-gen2.txt

View file

1

Documentation/devicetree/bindings/pci/rcar-pci.txt

View file

10

Documentation/devicetree/bindings/regulator/tps65217.txt

View file

6

Documentation/devicetree/bindings/rtc/s3c-rtc.txt

View file

2

Documentation/devicetree/bindings/serial/fsl-imx-uart.txt

View file

2

Documentation/devicetree/bindings/sound/fsl-asoc-card.txt

View file

37

Documentation/devicetree/bindings/thermal/rcar-thermal.txt

View file

21

Documentation/dma-buf-sharing.txt

View file

2

Documentation/dvb/README.dvb-usb

View file

7

Documentation/filesystems/efivarfs.txt

View file

11

Documentation/kernel-parameters.txt

View file

4

Documentation/timers/hpet.txt

View file

1

Documentation/video4linux/v4l2-controls.txt

View file

3

Documentation/virtual/kvm/mmu.txt

View file

4

Documentation/watchdog/watchdog-parameters.txt

View file

88

MAINTAINERS

View file

2

Makefile

View file

39

arch/arc/Kconfig

View file

4

arch/arc/Makefile

View file

4

arch/arc/configs/axs101_defconfig

View file

10

arch/arc/configs/axs103_defconfig

View file

10

arch/arc/configs/axs103_smp_defconfig

View file

5

arch/arc/configs/nsim_700_defconfig

View file

3

arch/arc/configs/nsim_hs_defconfig

View file

6

arch/arc/configs/nsim_hs_smp_defconfig

View file

2

arch/arc/configs/nsimosci_defconfig

View file

3

arch/arc/configs/nsimosci_hs_defconfig

View file

12

arch/arc/configs/nsimosci_hs_smp_defconfig

View file

18

arch/arc/configs/tb10x_defconfig

View file

2

arch/arc/configs/vdk_hs38_smp_defconfig

View file

35

arch/arc/include/asm/arcregs.h

View file

2

arch/arc/include/asm/irq.h

View file

18

arch/arc/include/asm/irqflags-arcv2.h

View file

4

arch/arc/include/asm/mcip.h

View file

45

arch/arc/include/asm/pgtable.h

View file

30

arch/arc/kernel/entry-arcv2.S

View file

41

arch/arc/kernel/intc-arcv2.c

View file

3

arch/arc/kernel/intc-compact.c

View file

70

arch/arc/kernel/mcip.c

View file

100

arch/arc/kernel/setup.c

View file

3

arch/arc/kernel/smp.c

View file

8

arch/arc/kernel/time.c

View file

2

arch/arm/boot/compressed/Makefile

View file

14

arch/arm/boot/dts/am335x-bone-common.dtsi

View file

14

arch/arm/boot/dts/am335x-chilisom.dtsi

View file

14

arch/arm/boot/dts/am335x-nano.dts

View file

14

arch/arm/boot/dts/am335x-pepper.dts

View file

4

arch/arm/boot/dts/am335x-shc.dts

View file

13

arch/arm/boot/dts/am335x-sl50.dts

View file

4

arch/arm/boot/dts/am57xx-beagle-x15.dts

View file

2

arch/arm/boot/dts/am57xx-cl-som-am57x.dts

View file

4

arch/arm/boot/dts/armada-xp-axpwifiap.dts

View file

4

arch/arm/boot/dts/armada-xp-db.dts

View file

4

arch/arm/boot/dts/armada-xp-gp.dts

View file

4

arch/arm/boot/dts/armada-xp-lenovo-ix4-300d.dts

View file

4

arch/arm/boot/dts/armada-xp-linksys-mamba.dts

View file

4

arch/arm/boot/dts/armada-xp-matrix.dts

View file

4

arch/arm/boot/dts/armada-xp-netgear-rn2120.dts

View file

6

arch/arm/boot/dts/armada-xp-openblocks-ax3-4.dts

View file

4

arch/arm/boot/dts/armada-xp-synology-ds414.dts

View file

10

arch/arm/boot/dts/dra7.dtsi

View file

1

arch/arm/boot/dts/imx6qdl.dtsi

View file

2

arch/arm/boot/dts/kirkwood-ds112.dts

View file

31

arch/arm/boot/dts/orion5x-linkstation-lswtgl.dts

View file

1

arch/arm/boot/dts/r8a7791-porter.dts

View file

2

arch/arm/boot/dts/sama5d2-pinfunc.h

View file

56

arch/arm/boot/dts/tps65217.dtsi

View file

9

arch/arm/common/icst.c

View file

33

arch/arm/configs/omap2plus_defconfig

View file

4

arch/arm/crypto/aes-ce-glue.c

View file

1

arch/arm/include/asm/arch_gicv3.h

View file

Some files were not shown because too many files have changed in this diff Show more