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

2026-11-02 19:05:42 +00:00 · 2011-06-29 10:34:54 -07:00 · 2011-06-29 10:34:54 -07:00 · 8eb2c0ee67
commit 8eb2c0ee67
parent 3e0dc6b01f 0d72c6fcb5
226 changed files with 1969 additions and 1177 deletions
--- a/Documentation/power/devices.txt
+++ b/Documentation/power/devices.txt
--- a/Documentation/power/runtime_pm.txt
+++ b/Documentation/power/runtime_pm.txt
--- a/Documentation/usb/error-codes.txt
+++ b/Documentation/usb/error-codes.txt
--- a/12
+++ b/12
--- a/2
+++ b/2
--- a/arch/alpha/include/asm/mmzone.h
+++ b/arch/alpha/include/asm/mmzone.h
--- a/arch/arm/boot/compressed/head.S
+++ b/arch/arm/boot/compressed/head.S
--- a/arch/arm/include/asm/assembler.h
+++ b/arch/arm/include/asm/assembler.h
--- a/arch/arm/include/asm/entry-macro-multi.S
+++ b/arch/arm/include/asm/entry-macro-multi.S
--- a/arch/arm/kernel/module.c
+++ b/arch/arm/kernel/module.c
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
--- a/arch/arm/mach-exynos4/init.c
+++ b/arch/arm/mach-exynos4/init.c
--- a/arch/arm/mach-h720x/Kconfig
+++ b/arch/arm/mach-h720x/Kconfig
--- a/arch/arm/mach-ux500/board-mop500-pins.c
+++ b/arch/arm/mach-ux500/board-mop500-pins.c
--- a/arch/arm/mach-ux500/board-mop500.c
+++ b/arch/arm/mach-ux500/board-mop500.c
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
--- a/arch/arm/plat-iop/cp6.c
+++ b/arch/arm/plat-iop/cp6.c
--- a/arch/arm/plat-samsung/include/plat/regs-serial.h
+++ b/arch/arm/plat-samsung/include/plat/regs-serial.h
--- a/arch/m32r/include/asm/mmzone.h
+++ b/arch/m32r/include/asm/mmzone.h
--- a/arch/mn10300/include/asm/uaccess.h
+++ b/arch/mn10300/include/asm/uaccess.h
--- a/arch/parisc/include/asm/mmzone.h
+++ b/arch/parisc/include/asm/mmzone.h
--- a/arch/powerpc/include/asm/mmzone.h
+++ b/arch/powerpc/include/asm/mmzone.h
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
--- a/arch/s390/oprofile/init.c
+++ b/arch/s390/oprofile/init.c
--- a/arch/sh/include/asm/mmzone.h
+++ b/arch/sh/include/asm/mmzone.h
--- a/arch/sparc/include/asm/mmzone.h
+++ b/arch/sparc/include/asm/mmzone.h
--- a/arch/tile/include/asm/mmzone.h
+++ b/arch/tile/include/asm/mmzone.h
--- a/arch/um/include/asm/percpu.h
+++ b/arch/um/include/asm/percpu.h
--- a/arch/x86/include/asm/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
--- a/arch/x86/include/asm/mmzone_64.h
+++ b/arch/x86/include/asm/mmzone_64.h
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/block/blk-throttle.c
+++ b/block/blk-throttle.c
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
--- a/block/genhd.c
+++ b/block/genhd.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/pata_marvell.c
+++ b/drivers/ata/pata_marvell.c
--- a/drivers/ata/sata_dwc_460ex.c
+++ b/drivers/ata/sata_dwc_460ex.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/base/power/clock_ops.c
+++ b/drivers/base/power/clock_ops.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
--- a/drivers/firmware/google/Kconfig
+++ b/drivers/firmware/google/Kconfig
--- a/drivers/gpu/drm/drm_gem.c
+++ b/drivers/gpu/drm/drm_gem.c
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
--- a/drivers/gpu/drm/ttm/ttm_tt.c
+++ b/drivers/gpu/drm/ttm/ttm_tt.c
--- a/drivers/hid/hid-core.c
+++ b/drivers/hid/hid-core.c
--- a/drivers/hid/hid-ids.h
+++ b/drivers/hid/hid-ids.h
--- a/drivers/hid/hid-multitouch.c
+++ b/drivers/hid/hid-multitouch.c
--- a/drivers/infiniband/hw/cxgb4/cm.c
+++ b/drivers/infiniband/hw/cxgb4/cm.c
--- a/drivers/infiniband/hw/cxgb4/cq.c
+++ b/drivers/infiniband/hw/cxgb4/cq.c
--- a/drivers/infiniband/hw/cxgb4/mem.c
+++ b/drivers/infiniband/hw/cxgb4/mem.c
--- a/drivers/infiniband/hw/cxgb4/qp.c
+++ b/drivers/infiniband/hw/cxgb4/qp.c
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
--- a/drivers/infiniband/hw/qib/qib_intr.c
+++ b/drivers/infiniband/hw/qib/qib_intr.c
--- a/drivers/leds/leds-lp5521.c
+++ b/drivers/leds/leds-lp5521.c
--- a/drivers/leds/leds-lp5523.c
+++ b/drivers/leds/leds-lp5523.c
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
--- a/drivers/misc/cb710/sgbuf2.c
+++ b/drivers/misc/cb710/sgbuf2.c
--- a/drivers/misc/ioc4.c
+++ b/drivers/misc/ioc4.c
--- a/drivers/misc/lkdtm.c
+++ b/drivers/misc/lkdtm.c
--- a/drivers/misc/pti.c
+++ b/drivers/misc/pti.c
--- a/drivers/misc/ti-st/st_core.c
+++ b/drivers/misc/ti-st/st_core.c
--- a/drivers/misc/ti-st/st_kim.c
+++ b/drivers/misc/ti-st/st_kim.c
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
--- a/drivers/mmc/card/queue.c
+++ b/drivers/mmc/card/queue.c
--- a/drivers/mmc/card/queue.h
+++ b/drivers/mmc/card/queue.h
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
--- a/drivers/mmc/core/sdio.c
+++ b/drivers/mmc/core/sdio.c
--- a/drivers/mmc/core/sdio_bus.c
+++ b/drivers/mmc/core/sdio_bus.c
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
--- a/drivers/mmc/host/sh_mobile_sdhi.c
+++ b/drivers/mmc/host/sh_mobile_sdhi.c
--- a/drivers/mmc/host/tmio_mmc_pio.c
+++ b/drivers/mmc/host/tmio_mmc_pio.c
--- a/drivers/mmc/host/vub300.c
+++ b/drivers/mmc/host/vub300.c
--- a/drivers/pci/pci-driver.c
+++ b/drivers/pci/pci-driver.c
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
--- a/drivers/rtc/rtc-ds1307.c
+++ b/drivers/rtc/rtc-ds1307.c
--- a/drivers/rtc/rtc-vt8500.c
+++ b/drivers/rtc/rtc-vt8500.c
--- a/drivers/staging/brcm80211/Kconfig
+++ b/drivers/staging/brcm80211/Kconfig
--- a/drivers/staging/comedi/Kconfig
+++ b/drivers/staging/comedi/Kconfig
--- a/drivers/staging/iio/Kconfig
+++ b/drivers/staging/iio/Kconfig
--- a/drivers/staging/iio/accel/adis16204.h
+++ b/drivers/staging/iio/accel/adis16204.h
--- a/drivers/staging/iio/accel/adis16209.h
+++ b/drivers/staging/iio/accel/adis16209.h
--- a/drivers/staging/iio/gyro/adis16260.h
+++ b/drivers/staging/iio/gyro/adis16260.h
--- a/drivers/staging/iio/imu/adis16400.h
+++ b/drivers/staging/iio/imu/adis16400.h
--- a/drivers/staging/mei/init.c
+++ b/drivers/staging/mei/init.c
--- a/drivers/staging/mei/wd.c
+++ b/drivers/staging/mei/wd.c
--- a/drivers/target/loopback/tcm_loop.c
+++ b/drivers/target/loopback/tcm_loop.c
--- a/drivers/target/target_core_configfs.c
+++ b/drivers/target/target_core_configfs.c
--- a/drivers/target/target_core_device.c
+++ b/drivers/target/target_core_device.c
--- a/drivers/target/target_core_pr.c
+++ b/drivers/target/target_core_pr.c
--- a/drivers/target/target_core_tmr.c
+++ b/drivers/target/target_core_tmr.c
--- a/drivers/target/target_core_transport.c
+++ b/drivers/target/target_core_transport.c
--- a/Show more
+++ b/Show more