Merge branch 'hid-suspend' into picolcd

2026-11-13 07:31:07 +00:00 · 2010-05-03 15:25:35 +02:00 · 2010-05-03 15:25:35 +02:00 · d6d53cbc6b
commit d6d53cbc6b
parent 0b5adf92ec 6a740aa4f4
4692 changed files with 57869 additions and 8800 deletions
--- a/drivers/acpi/ac.c
+++ b/drivers/acpi/ac.c
--- a/drivers/acpi/acpi_memhotplug.c
+++ b/drivers/acpi/acpi_memhotplug.c
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
--- a/drivers/acpi/bus.c
+++ b/drivers/acpi/bus.c
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
--- a/drivers/acpi/container.c
+++ b/drivers/acpi/container.c
--- a/drivers/acpi/debug.c
+++ b/drivers/acpi/debug.c
--- a/drivers/acpi/dock.c
+++ b/drivers/acpi/dock.c
--- a/drivers/acpi/ec.c
+++ b/drivers/acpi/ec.c
--- a/drivers/acpi/event.c
+++ b/drivers/acpi/event.c
--- a/drivers/acpi/glue.c
+++ b/drivers/acpi/glue.c
--- a/drivers/acpi/pci_irq.c
+++ b/drivers/acpi/pci_irq.c
--- a/drivers/acpi/pci_link.c
+++ b/drivers/acpi/pci_link.c
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
--- a/drivers/acpi/pci_slot.c
+++ b/drivers/acpi/pci_slot.c
--- a/drivers/acpi/power.c
+++ b/drivers/acpi/power.c
--- a/drivers/acpi/power_meter.c
+++ b/drivers/acpi/power_meter.c
--- a/drivers/acpi/processor_core.c
+++ b/drivers/acpi/processor_core.c
--- a/drivers/acpi/processor_driver.c
+++ b/drivers/acpi/processor_driver.c
--- a/drivers/acpi/processor_idle.c
+++ b/drivers/acpi/processor_idle.c
--- a/drivers/acpi/processor_perflib.c
+++ b/drivers/acpi/processor_perflib.c
--- a/drivers/acpi/processor_throttling.c
+++ b/drivers/acpi/processor_throttling.c
--- a/drivers/acpi/sbs.c
+++ b/drivers/acpi/sbs.c
--- a/drivers/acpi/sbshc.c
+++ b/drivers/acpi/sbshc.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/acpi/system.c
+++ b/drivers/acpi/system.c
--- a/drivers/acpi/thermal.c
+++ b/drivers/acpi/thermal.c
--- a/drivers/acpi/utils.c
+++ b/drivers/acpi/utils.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libata-acpi.c
+++ b/drivers/ata/libata-acpi.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
--- a/drivers/ata/libata-scsi.c
+++ b/drivers/ata/libata-scsi.c
--- a/drivers/ata/libata-sff.c
+++ b/drivers/ata/libata-sff.c
--- a/drivers/ata/pata_acpi.c
+++ b/drivers/ata/pata_acpi.c
--- a/drivers/ata/pata_at32.c
+++ b/drivers/ata/pata_at32.c
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
--- a/drivers/ata/pata_atp867x.c
+++ b/drivers/ata/pata_atp867x.c
--- a/drivers/ata/pata_cmd640.c
+++ b/drivers/ata/pata_cmd640.c
--- a/drivers/ata/pata_icside.c
+++ b/drivers/ata/pata_icside.c
--- a/drivers/ata/pata_it821x.c
+++ b/drivers/ata/pata_it821x.c
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
--- a/drivers/ata/pata_pcmcia.c
+++ b/drivers/ata/pata_pcmcia.c
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
--- a/drivers/ata/pata_rdc.c
+++ b/drivers/ata/pata_rdc.c
--- a/drivers/ata/pata_via.c
+++ b/drivers/ata/pata_via.c
--- a/drivers/ata/pdc_adma.c
+++ b/drivers/ata/pdc_adma.c
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
--- a/drivers/ata/sata_inic162x.c
+++ b/drivers/ata/sata_inic162x.c
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
--- a/drivers/ata/sata_nv.c
+++ b/drivers/ata/sata_nv.c
--- a/drivers/ata/sata_promise.c
+++ b/drivers/ata/sata_promise.c
--- a/drivers/ata/sata_qstor.c
+++ b/drivers/ata/sata_qstor.c
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
--- a/drivers/ata/sata_sx4.c
+++ b/drivers/ata/sata_sx4.c
--- a/drivers/ata/sata_uli.c
+++ b/drivers/ata/sata_uli.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/he.c
+++ b/drivers/atm/he.c
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
--- a/drivers/atm/idt77105.c
+++ b/drivers/atm/idt77105.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/suni.c
+++ b/drivers/atm/suni.c
--- a/drivers/atm/uPD98402.c
+++ b/drivers/atm/uPD98402.c
--- a/drivers/atm/zatm.c
+++ b/drivers/atm/zatm.c
--- a/drivers/auxdisplay/cfag12864b.c
+++ b/drivers/auxdisplay/cfag12864b.c
--- a/drivers/auxdisplay/cfag12864bfb.c
+++ b/drivers/auxdisplay/cfag12864bfb.c
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
--- a/drivers/base/bus.c
+++ b/drivers/base/bus.c
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
--- a/drivers/base/devres.c
+++ b/drivers/base/devres.c
--- a/drivers/base/devtmpfs.c
+++ b/drivers/base/devtmpfs.c
--- a/drivers/base/dma-coherent.c
+++ b/drivers/base/dma-coherent.c
--- a/drivers/base/dma-mapping.c
+++ b/drivers/base/dma-mapping.c
--- a/drivers/base/driver.c
+++ b/drivers/base/driver.c
--- a/drivers/base/firmware_class.c
+++ b/drivers/base/firmware_class.c
--- a/drivers/base/memory.c
+++ b/drivers/base/memory.c
--- a/drivers/base/module.c
+++ b/drivers/base/module.c
--- a/drivers/base/node.c
+++ b/drivers/base/node.c
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
--- a/drivers/block/amiflop.c
+++ b/drivers/block/amiflop.c
--- a/drivers/block/aoe/aoeblk.c
+++ b/drivers/block/aoe/aoeblk.c
--- a/drivers/block/aoe/aoechr.c
+++ b/drivers/block/aoe/aoechr.c
--- a/drivers/block/aoe/aoecmd.c
+++ b/drivers/block/aoe/aoecmd.c
--- a/Show more
+++ b/Show more