Merge branch 'drm-intel-next' of arrandale:git/linux-2.6 into drm-intel-next

2026-10-14 05:55:17 +00:00 · 2010-11-22 08:56:33 +00:00 · 2010-11-22 08:56:33 +00:00 · a940a75a9a
commit a940a75a9a
parent 8b5abbe068 e624ae8e0d
469 changed files with 3247 additions and 1904 deletions
--- a/Documentation/DocBook/uio-howto.tmpl
+++ b/Documentation/DocBook/uio-howto.tmpl
--- a/Documentation/arm/OMAP/DSS
+++ b/Documentation/arm/OMAP/DSS
--- a/Documentation/development-process/2.Process
+++ b/Documentation/development-process/2.Process
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
--- a/Documentation/filesystems/configfs/configfs_example_explicit.c
+++ b/Documentation/filesystems/configfs/configfs_example_explicit.c
--- a/Documentation/gpio.txt
+++ b/Documentation/gpio.txt
--- a/Documentation/hwmon/lm93
+++ b/Documentation/hwmon/lm93
--- a/Documentation/hwmon/max6650
+++ b/Documentation/hwmon/max6650
--- a/Documentation/power/opp.txt
+++ b/Documentation/power/opp.txt
--- a/14
+++ b/14
--- a/2
+++ b/2
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
--- a/arch/arm/mach-omap1/include/mach/camera.h
+++ b/arch/arm/mach-omap1/include/mach/camera.h
--- a/arch/arm/mach-omap2/board-devkit8000.c
+++ b/arch/arm/mach-omap2/board-devkit8000.c
--- a/arch/arm/mach-s3c64xx/Kconfig
+++ b/arch/arm/mach-s3c64xx/Kconfig
--- a/arch/arm/mach-shmobile/board-ap4evb.c
+++ b/arch/arm/mach-shmobile/board-ap4evb.c
--- a/arch/arm/mach-shmobile/intc-sh7372.c
+++ b/arch/arm/mach-shmobile/intc-sh7372.c
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
--- a/arch/blackfin/kernel/process.c
+++ b/arch/blackfin/kernel/process.c
--- a/arch/frv/kernel/process.c
+++ b/arch/frv/kernel/process.c
--- a/arch/h8300/kernel/process.c
+++ b/arch/h8300/kernel/process.c
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
--- a/arch/m68k/kernel/process.c
+++ b/arch/m68k/kernel/process.c
--- a/arch/m68knommu/kernel/process.c
+++ b/arch/m68knommu/kernel/process.c
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
--- a/arch/parisc/hpux/sys_hpux.c
+++ b/arch/parisc/hpux/sys_hpux.c
--- a/arch/parisc/kernel/sys_parisc32.c
+++ b/arch/parisc/kernel/sys_parisc32.c
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
--- a/arch/powerpc/boot/div64.S
+++ b/arch/powerpc/boot/div64.S
--- a/arch/powerpc/kernel/kgdb.c
+++ b/arch/powerpc/kernel/kgdb.c
--- a/arch/powerpc/kernel/setup_64.c
+++ b/arch/powerpc/kernel/setup_64.c
--- a/arch/powerpc/kernel/sys_ppc32.c
+++ b/arch/powerpc/kernel/sys_ppc32.c
--- a/arch/powerpc/mm/hash_utils_64.c
+++ b/arch/powerpc/mm/hash_utils_64.c
--- a/arch/powerpc/mm/tlb_low_64e.S
+++ b/arch/powerpc/mm/tlb_low_64e.S
--- a/arch/powerpc/mm/tlb_nohash.c
+++ b/arch/powerpc/mm/tlb_nohash.c
--- a/arch/powerpc/platforms/pseries/Kconfig
+++ b/arch/powerpc/platforms/pseries/Kconfig
--- a/arch/powerpc/platforms/pseries/eeh.c
+++ b/arch/powerpc/platforms/pseries/eeh.c
--- a/arch/powerpc/platforms/pseries/pci_dlpar.c
+++ b/arch/powerpc/platforms/pseries/pci_dlpar.c
--- a/arch/s390/Kconfig.debug
+++ b/arch/s390/Kconfig.debug
--- a/arch/s390/include/asm/page.h
+++ b/arch/s390/include/asm/page.h
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
--- a/arch/s390/kernel/kprobes.c
+++ b/arch/s390/kernel/kprobes.c
--- a/arch/s390/mm/gup.c
+++ b/arch/s390/mm/gup.c
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
--- a/arch/sparc/kernel/sys_sparc32.c
+++ b/arch/sparc/kernel/sys_sparc32.c
--- a/arch/sparc/kernel/sys_sparc_32.c
+++ b/arch/sparc/kernel/sys_sparc_32.c
--- a/arch/sparc/kernel/unaligned_32.c
+++ b/arch/sparc/kernel/unaligned_32.c
--- a/arch/sparc/kernel/windows.c
+++ b/arch/sparc/kernel/windows.c
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
--- a/arch/tile/kernel/compat_signal.c
+++ b/arch/tile/kernel/compat_signal.c
--- a/arch/tile/kernel/signal.c
+++ b/arch/tile/kernel/signal.c
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
--- a/arch/tile/kernel/sys.c
+++ b/arch/tile/kernel/sys.c
--- a/arch/tile/mm/fault.c
+++ b/arch/tile/mm/fault.c
--- a/arch/tile/mm/hugetlbpage.c
+++ b/arch/tile/mm/hugetlbpage.c
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
--- a/arch/x86/ia32/sys_ia32.c
+++ b/arch/x86/ia32/sys_ia32.c
--- a/arch/x86/kernel/cpuid.c
+++ b/arch/x86/kernel/cpuid.c
--- a/arch/x86/kernel/kgdb.c
+++ b/arch/x86/kernel/kgdb.c
--- a/arch/x86/kernel/msr.c
+++ b/arch/x86/kernel/msr.c
--- a/arch/x86/kvm/svm.c
+++ b/arch/x86/kvm/svm.c
--- a/arch/x86/kvm/vmx.c
+++ b/arch/x86/kvm/vmx.c
--- a/arch/x86/pci/acpi.c
+++ b/arch/x86/pci/acpi.c
--- a/block/compat_ioctl.c
+++ b/block/compat_ioctl.c
--- a/block/ioctl.c
+++ b/block/ioctl.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/sata_via.c
+++ b/drivers/ata/sata_via.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
--- a/drivers/char/agp/frontend.c
+++ b/drivers/char/agp/frontend.c
--- a/drivers/char/amiserial.c
+++ b/drivers/char/amiserial.c
--- a/drivers/char/briq_panel.c
+++ b/drivers/char/briq_panel.c
--- a/drivers/char/hpet.c
+++ b/drivers/char/hpet.c
--- a/drivers/char/hw_random/core.c
+++ b/drivers/char/hw_random/core.c
--- a/drivers/char/i8k.c
+++ b/drivers/char/i8k.c
--- a/drivers/char/istallion.c
+++ b/drivers/char/istallion.c
--- a/drivers/char/serial167.c
+++ b/drivers/char/serial167.c
--- a/drivers/char/specialix.c
+++ b/drivers/char/specialix.c
--- a/drivers/char/stallion.c
+++ b/drivers/char/stallion.c
--- a/drivers/char/sx.c
+++ b/drivers/char/sx.c
--- a/drivers/char/uv_mmtimer.c
+++ b/drivers/char/uv_mmtimer.c
--- a/drivers/firewire/sbp2.c
+++ b/drivers/firewire/sbp2.c
--- a/drivers/gpu/drm/drm_fops.c
+++ b/drivers/gpu/drm/drm_fops.c
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
--- a/drivers/gpu/drm/i915/i915_suspend.c
+++ b/drivers/gpu/drm/i915/i915_suspend.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/nouveau/nouveau_backlight.c
+++ b/drivers/gpu/drm/nouveau/nouveau_backlight.c
--- a/drivers/gpu/drm/nouveau/nouveau_bios.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bios.c
--- a/drivers/gpu/drm/nouveau/nouveau_bo.c
+++ b/drivers/gpu/drm/nouveau/nouveau_bo.c
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
--- a/drivers/gpu/drm/nouveau/nouveau_connector.h
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.h
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
--- a/Show more
+++ b/Show more