Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

2026-11-13 07:31:07 +00:00 · 2010-12-22 12:56:10 +09:00 · 2010-12-22 12:56:10 +09:00 · 7ccbefe07e
commit 7ccbefe07e
parent 623eb15647 90a8a73c06
1151 changed files with 21711 additions and 11385 deletions
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
--- a/drivers/acpi/apei/hest.c
+++ b/drivers/acpi/apei/hest.c
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.c
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
--- a/drivers/acpi/processor_thermal.c
+++ b/drivers/acpi/processor_thermal.c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.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/atm/adummy.c
+++ b/drivers/atm/adummy.c
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
--- a/drivers/atm/atmtcp.c
+++ b/drivers/atm/atmtcp.c
--- a/drivers/atm/eni.c
+++ b/drivers/atm/eni.c
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
--- a/drivers/atm/he.c
+++ b/drivers/atm/he.c
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
--- a/drivers/atm/nicstar.c
+++ b/drivers/atm/nicstar.c
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
--- a/drivers/block/ataflop.c
+++ b/drivers/block/ataflop.c
--- a/drivers/block/cciss.c
+++ b/drivers/block/cciss.c
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
--- a/drivers/block/drbd/drbd_worker.c
+++ b/drivers/block/drbd/drbd_worker.c
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
--- a/drivers/block/xen-blkfront.c
+++ b/drivers/block/xen-blkfront.c
--- a/drivers/bluetooth/ath3k.c
+++ b/drivers/bluetooth/ath3k.c
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
--- a/drivers/char/agp/intel-gtt.c
+++ b/drivers/char/agp/intel-gtt.c
--- a/drivers/char/tpm/tpm_tis.c
+++ b/drivers/char/tpm/tpm_tis.c
--- a/drivers/char/virtio_console.c
+++ b/drivers/char/virtio_console.c
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
--- a/drivers/connector/connector.c
+++ b/drivers/connector/connector.c
--- a/drivers/dma/Makefile
+++ b/drivers/dma/Makefile
--- a/drivers/dma/at_hdmac.c
+++ b/drivers/dma/at_hdmac.c
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
--- a/drivers/dma/fsldma.h
+++ b/drivers/dma/fsldma.h
--- a/drivers/dma/imx-dma.c
+++ b/drivers/dma/imx-dma.c
--- a/drivers/dma/imx-sdma.c
+++ b/drivers/dma/imx-sdma.c
--- a/drivers/dma/intel_mid_dma.c
+++ b/drivers/dma/intel_mid_dma.c
--- a/drivers/dma/ioat/Makefile
+++ b/drivers/dma/ioat/Makefile
--- a/drivers/dma/pch_dma.c
+++ b/drivers/dma/pch_dma.c
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
--- a/drivers/edac/Makefile
+++ b/drivers/edac/Makefile
--- a/drivers/edac/amd64_edac.c
+++ b/drivers/edac/amd64_edac.c
--- a/drivers/edac/edac_core.h
+++ b/drivers/edac/edac_core.h
--- a/drivers/edac/edac_mc.c
+++ b/drivers/edac/edac_mc.c
--- a/drivers/edac/mce_amd_inj.c
+++ b/drivers/edac/mce_amd_inj.c
--- a/drivers/firewire/net.c
+++ b/drivers/firewire/net.c
--- a/drivers/firewire/ohci.c
+++ b/drivers/firewire/ohci.c
--- a/drivers/gpio/cs5535-gpio.c
+++ b/drivers/gpio/cs5535-gpio.c
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
--- a/drivers/gpu/drm/drm_irq.c
+++ b/drivers/gpu/drm/drm_irq.c
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.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_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_acpi.c
+++ b/drivers/gpu/drm/i915/intel_acpi.c
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
--- a/drivers/gpu/drm/i915/intel_i2c.c
+++ b/drivers/gpu/drm/i915/intel_i2c.c
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.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/drivers/gpu/drm/nouveau/nouveau_fence.c
+++ b/drivers/gpu/drm/nouveau/nouveau_fence.c
--- a/drivers/gpu/drm/nouveau/nouveau_gem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_gem.c
--- a/drivers/gpu/drm/nouveau/nouveau_hw.c
+++ b/drivers/gpu/drm/nouveau/nouveau_hw.c
--- a/drivers/gpu/drm/nouveau/nouveau_hw.h
+++ b/drivers/gpu/drm/nouveau/nouveau_hw.h
--- a/drivers/gpu/drm/nouveau/nouveau_i2c.c
+++ b/drivers/gpu/drm/nouveau/nouveau_i2c.c
--- a/drivers/gpu/drm/nouveau/nouveau_irq.c
+++ b/drivers/gpu/drm/nouveau/nouveau_irq.c
--- a/drivers/gpu/drm/nouveau/nouveau_mem.c
+++ b/drivers/gpu/drm/nouveau/nouveau_mem.c
--- a/drivers/gpu/drm/nouveau/nouveau_object.c
+++ b/drivers/gpu/drm/nouveau/nouveau_object.c
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
--- a/drivers/gpu/drm/nouveau/nouveau_ramht.c
+++ b/drivers/gpu/drm/nouveau/nouveau_ramht.c
--- a/drivers/gpu/drm/nouveau/nouveau_sgdma.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sgdma.c
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
--- a/drivers/gpu/drm/nouveau/nouveau_temp.c
+++ b/drivers/gpu/drm/nouveau/nouveau_temp.c
--- a/drivers/gpu/drm/nouveau/nv04_crtc.c
+++ b/drivers/gpu/drm/nouveau/nv04_crtc.c
--- a/drivers/gpu/drm/nouveau/nv04_dfp.c
+++ b/drivers/gpu/drm/nouveau/nv04_dfp.c
--- a/drivers/gpu/drm/nouveau/nv04_pm.c
+++ b/drivers/gpu/drm/nouveau/nv04_pm.c
--- a/drivers/gpu/drm/nouveau/nv50_calc.c
+++ b/drivers/gpu/drm/nouveau/nv50_calc.c
--- a/Show more
+++ b/Show more