Merge branch 'drm-intel-fixes' into drm-intel-next

Browse source

Merge important suspend and resume regression fixes and resolve the
small conflict.

Conflicts:
	drivers/gpu/drm/i915/i915_dma.c

...

This commit is contained in:

Chris Wilson 2011-01-23 17:24:26 +00:00

parent a37f2f87ed 8e934dbf26

commit bdd92c9ad2

1108 changed files with 115337 additions and 114947 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

4

Documentation/DocBook/device-drivers.tmpl

View file

2

Documentation/DocBook/dvb/dvbapi.xml

View file

4

Documentation/DocBook/media.tmpl

View file

6

Documentation/DocBook/v4l/dev-rds.xml

View file

3

Documentation/DocBook/v4l/v4l2.xml

View file

8

Documentation/feature-removal-schedule.txt

View file

73

Documentation/lguest/lguest.c

View file

5

Documentation/lguest/lguest.txt

View file

45

Documentation/sound/alsa/soc/codec.txt

View file

38

Documentation/sound/alsa/soc/machine.txt

View file

12

Documentation/sound/alsa/soc/platform.txt

View file

12

Documentation/video4linux/v4l2-controls.txt

View file

82

MAINTAINERS

View file

2

Makefile

View file

19

arch/alpha/Kconfig

View file

2

arch/arm/configs/ag5evm_defconfig

View file

2

arch/arm/configs/am200epdkit_defconfig

View file

2

arch/arm/configs/at572d940hfek_defconfig

View file

2

arch/arm/configs/badge4_defconfig

View file

2

arch/arm/configs/bcmring_defconfig

View file

2

arch/arm/configs/cm_x2xx_defconfig

View file

2

arch/arm/configs/colibri_pxa270_defconfig

View file

2

arch/arm/configs/collie_defconfig

View file

2

arch/arm/configs/corgi_defconfig

View file

2

arch/arm/configs/da8xx_omapl_defconfig

View file

2

arch/arm/configs/davinci_all_defconfig

View file

2

arch/arm/configs/dove_defconfig

View file

2

arch/arm/configs/ebsa110_defconfig

View file

2

arch/arm/configs/edb7211_defconfig

View file

2

arch/arm/configs/em_x270_defconfig

View file

2

arch/arm/configs/ep93xx_defconfig

View file

2

arch/arm/configs/eseries_pxa_defconfig

View file

2

arch/arm/configs/ezx_defconfig

View file

2

arch/arm/configs/footbridge_defconfig

View file

2

arch/arm/configs/fortunet_defconfig

View file

2

arch/arm/configs/h5000_defconfig

View file

2

arch/arm/configs/imote2_defconfig

View file

2

arch/arm/configs/ixp2000_defconfig

View file

2

arch/arm/configs/ixp23xx_defconfig

View file

2

arch/arm/configs/ixp4xx_defconfig

View file

2

arch/arm/configs/loki_defconfig

View file

2

arch/arm/configs/lpd7a400_defconfig

View file

2

arch/arm/configs/lpd7a404_defconfig

View file

2

arch/arm/configs/magician_defconfig

View file

2

arch/arm/configs/mv78xx0_defconfig

View file

2

arch/arm/configs/mx1_defconfig

View file

2

arch/arm/configs/mx21_defconfig

View file

2

arch/arm/configs/mx27_defconfig

View file

2

arch/arm/configs/mx3_defconfig

View file

2

arch/arm/configs/mx51_defconfig

View file

2

arch/arm/configs/nhk8815_defconfig

View file

2

arch/arm/configs/omap1_defconfig

View file

2

arch/arm/configs/omap2plus_defconfig

View file

2

arch/arm/configs/orion5x_defconfig

View file

2

arch/arm/configs/pcm027_defconfig

View file

2

arch/arm/configs/pcontrol_g20_defconfig

View file

2

arch/arm/configs/pleb_defconfig

View file

2

arch/arm/configs/pnx4008_defconfig

View file

2

arch/arm/configs/simpad_defconfig

View file

2

arch/arm/configs/spitz_defconfig

View file

2

arch/arm/configs/stmp378x_defconfig

View file

2

arch/arm/configs/stmp37xx_defconfig

View file

2

arch/arm/configs/tct_hammer_defconfig

View file

2

arch/arm/configs/trizeps4_defconfig

View file

2

arch/arm/configs/u300_defconfig

View file

2

arch/arm/configs/viper_defconfig

View file

2

arch/arm/configs/xcep_defconfig

View file

4

arch/arm/mach-msm/board-qsd8x50.c

View file

4

arch/avr32/Kconfig

View file

17

arch/blackfin/Kconfig

View file

2

arch/blackfin/configs/BF518F-EZBRD_defconfig

View file

2

arch/blackfin/configs/BF526-EZBRD_defconfig

View file

2

arch/blackfin/configs/BF527-AD7160-EVAL_defconfig

View file

2

arch/blackfin/configs/BF527-EZKIT-V2_defconfig

View file

2

arch/blackfin/configs/BF527-EZKIT_defconfig

View file

2

arch/blackfin/configs/BF527-TLL6527M_defconfig

View file

2

arch/blackfin/configs/BF533-EZKIT_defconfig

View file

2

arch/blackfin/configs/BF533-STAMP_defconfig

View file

2

arch/blackfin/configs/BF537-STAMP_defconfig

View file

2

arch/blackfin/configs/BF538-EZKIT_defconfig

View file

2

arch/blackfin/configs/BF548-EZKIT_defconfig

View file

2

arch/blackfin/configs/BF561-ACVILON_defconfig

View file

2

arch/blackfin/configs/BF561-EZKIT-SMP_defconfig

View file

2

arch/blackfin/configs/BF561-EZKIT_defconfig

View file

2

arch/blackfin/configs/BlackStamp_defconfig

View file

2

arch/blackfin/configs/CM-BF527_defconfig

View file

2

arch/blackfin/configs/CM-BF533_defconfig

View file

2

arch/blackfin/configs/CM-BF537E_defconfig

View file

2

arch/blackfin/configs/CM-BF537U_defconfig

View file

2

arch/blackfin/configs/CM-BF548_defconfig

View file

2

arch/blackfin/configs/CM-BF561_defconfig

View file

2

arch/blackfin/configs/DNP5370_defconfig

View file

2

arch/blackfin/configs/H8606_defconfig

View file

2

arch/blackfin/configs/IP0X_defconfig

View file

2

arch/blackfin/configs/PNAV-10_defconfig

View file

2

arch/blackfin/configs/SRV1_defconfig

View file

2

arch/blackfin/configs/TCM-BF518_defconfig

View file

2

arch/blackfin/configs/TCM-BF537_defconfig

View file

6

arch/cris/Kconfig

View file

41

arch/cris/arch-v10/kernel/irq.c

View file

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