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

Browse source

Conflicts:
	drivers/gpu/drm/i915/Makefile

Makefile cleanup in drm-intel-next conflicts with a build-fix to move
intel_opregion under CONFIG_ACPI.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

...

This commit is contained in:

Daniel Vetter 2014-03-18 09:43:56 +01:00

parent 2fae6a860c e40d641099

commit e19b913714

9935 changed files with 559266 additions and 244920 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

3

.gitignore vendored

View file

4

CREDITS

View file

24

Documentation/00-INDEX

View file

12

Documentation/ABI/testing/configfs-usb-gadget

View file

2

Documentation/ABI/testing/configfs-usb-gadget-acm

View file

2

Documentation/ABI/testing/configfs-usb-gadget-ecm

View file

2

Documentation/ABI/testing/configfs-usb-gadget-eem

View file

9

Documentation/ABI/testing/configfs-usb-gadget-ffs

View file

8

Documentation/ABI/testing/configfs-usb-gadget-loopback

View file

4

Documentation/ABI/testing/configfs-usb-gadget-mass-storage

View file

2

Documentation/ABI/testing/configfs-usb-gadget-ncm

View file

2

Documentation/ABI/testing/configfs-usb-gadget-obex

View file

2

Documentation/ABI/testing/configfs-usb-gadget-phonet

View file

2

Documentation/ABI/testing/configfs-usb-gadget-rndis

View file

2

Documentation/ABI/testing/configfs-usb-gadget-serial

View file

12

Documentation/ABI/testing/configfs-usb-gadget-sourcesink

View file

2

Documentation/ABI/testing/configfs-usb-gadget-subset

View file

91

Documentation/ABI/testing/debugfs-driver-genwqe

View file

13

Documentation/ABI/testing/sysfs-bus-iio

View file

11

Documentation/ABI/testing/sysfs-bus-pci

View file

26

Documentation/ABI/testing/sysfs-bus-rbd

View file

10

Documentation/ABI/testing/sysfs-bus-usb

View file

8

Documentation/ABI/testing/sysfs-class-net-mesh

View file

24

Documentation/ABI/testing/sysfs-devices-system-cpu

View file

62

Documentation/ABI/testing/sysfs-driver-genwqe

View file

20

Documentation/ABI/testing/sysfs-firmware-efi

View file

34

Documentation/ABI/testing/sysfs-firmware-efi-runtime-map

View file

31

Documentation/ABI/testing/sysfs-fs-f2fs

View file

38

Documentation/ABI/testing/sysfs-kernel-boot_params

View file

14

Documentation/ABI/testing/sysfs-kernel-vmcoreinfo

View file

16

Documentation/ABI/testing/sysfs-platform-tahvo-usb

View file

1

Documentation/DocBook/.gitignore vendored

View file

5

Documentation/DocBook/Makefile

View file

1

Documentation/DocBook/kernel-api.tmpl

View file

12

Documentation/DocBook/media/v4l/compat.xml

View file

41

Documentation/DocBook/media/v4l/controls.xml

View file

9

Documentation/DocBook/media/v4l/dev-overlay.xml

View file

9

Documentation/DocBook/media/v4l/media-ioc-enum-links.xml

View file

163

Documentation/DocBook/media/v4l/subdev-formats.xml

View file

10

Documentation/DocBook/media/v4l/v4l2.xml

View file

10

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

View file

2

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

View file

4

Documentation/HOWTO

View file

2

Documentation/IRQ-domain.txt

View file

4

Documentation/PCI/00-INDEX

View file

389

Documentation/PCI/MSI-HOWTO.txt

View file

6

Documentation/PCI/pci.txt

View file

2

Documentation/RCU/00-INDEX

View file

22

Documentation/RCU/trace.txt

View file

19

Documentation/acpi/apei/einj.txt

View file

36

Documentation/acpi/enumeration.txt

View file

9

Documentation/acpi/namespace.txt

View file

14

Documentation/arm/00-INDEX

View file

24

Documentation/arm/Marvell/README

View file

13

Documentation/arm/Samsung-S3C24XX/GPIO.txt

View file

6

Documentation/blackfin/00-INDEX

View file

2

Documentation/block/00-INDEX

View file

7

Documentation/block/biodoc.txt

View file

111

Documentation/block/biovecs.txt

View file

21

Documentation/blockdev/ramdisk.txt

View file

6

drivers/staging/zram/zram.txt → Documentation/blockdev/zram.txt

View file

20

Documentation/cgroups/cgroups.txt

View file

4

Documentation/cgroups/memory.txt

View file

5

Documentation/cgroups/net_cls.txt

View file

6

Documentation/cgroups/resource_counter.txt

View file

45

Documentation/circular-buffers.txt

View file

7

Documentation/clk.txt

View file

26

Documentation/cpu-freq/boost.txt

View file

40

Documentation/cpu-freq/intel-pstate.txt

View file

2

Documentation/cpu-hotplug.txt

View file

41

Documentation/debugging-via-ohci1394.txt

View file

16

Documentation/device-mapper/cache-policies.txt

View file

49

Documentation/device-mapper/cache.txt

View file

7

Documentation/device-mapper/thin-provisioning.txt

View file

1

Documentation/devices.txt

View file

2

Documentation/devicetree/00-INDEX

View file

39

Documentation/devicetree/bindings/ABI.txt

View file

8

Documentation/devicetree/bindings/arm/arm-boards

View file

1

Documentation/devicetree/bindings/arm/atmel-aic.txt

View file

11

Documentation/devicetree/bindings/arm/atmel-at91.txt

View file

7

Documentation/devicetree/bindings/arm/bcm/kona-timer.txt

View file

46

Documentation/devicetree/bindings/arm/davinci/nand.txt

View file

20

Documentation/devicetree/bindings/arm/firmware/tlm,trusted-foundations.txt

View file

1

Documentation/devicetree/bindings/arm/gic.txt

View file

32

Documentation/devicetree/bindings/arm/hisilicon/hisilicon.txt

View file

23

Documentation/devicetree/bindings/arm/l2cc.txt

View file

24

Documentation/devicetree/bindings/arm/marvell,berlin.txt

View file

12

Documentation/devicetree/bindings/arm/moxart.txt

View file

55

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

View file

7

Documentation/devicetree/bindings/arm/samsung/sysreg.txt

View file

5

Documentation/devicetree/bindings/arm/tegra.txt

View file

5

Documentation/devicetree/bindings/arm/versatile-fpga-irq.txt

View file

2

Documentation/devicetree/bindings/ata/marvell.txt

View file

18

Documentation/devicetree/bindings/ata/sata_rcar.txt

View file

339

Documentation/devicetree/bindings/clock/at91-clock.txt

View file

93

Documentation/devicetree/bindings/clock/bcm-kona-clock.txt

View file

39

Documentation/devicetree/bindings/clock/clk-exynos-audss.txt

View file

2

Documentation/devicetree/bindings/clock/clock-bindings.txt

View file

134

Documentation/devicetree/bindings/clock/corenet-clock.txt

View file

98

Documentation/devicetree/bindings/clock/emev2-clock.txt

View file

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