Merge branch 'master' into upstream.

This is sync with Linus' tree to receive KEY_IMAGES definition that went in through input tree.
2026-11-13 07:31:07 +00:00 · 2011-05-18 17:06:31 +02:00 · 2011-05-18 17:06:31 +02:00 · 6b7b8e488b
commit 6b7b8e488b
parent b50f315cbb c1d10d18c5
6429 changed files with 222092 additions and 109758 deletions
--- a/drivers/acpi/acpi_pad.c
+++ b/drivers/acpi/acpi_pad.c
--- a/drivers/acpi/acpica/Makefile
+++ b/drivers/acpi/acpica/Makefile
--- a/drivers/acpi/acpica/acdispat.h
+++ b/drivers/acpi/acpica/acdispat.h
--- a/drivers/acpi/acpica/acglobal.h
+++ b/drivers/acpi/acpica/acglobal.h
--- a/drivers/acpi/acpica/aclocal.h
+++ b/drivers/acpi/acpica/aclocal.h
--- a/drivers/acpi/acpica/dsargs.c
+++ b/drivers/acpi/acpica/dsargs.c
--- a/drivers/acpi/acpica/dscontrol.c
+++ b/drivers/acpi/acpica/dscontrol.c
--- a/drivers/acpi/acpica/dsopcode.c
+++ b/drivers/acpi/acpica/dsopcode.c
--- a/drivers/acpi/acpica/dswload.c
+++ b/drivers/acpi/acpica/dswload.c
--- a/drivers/acpi/acpica/dswload2.c
+++ b/drivers/acpi/acpica/dswload2.c
--- a/drivers/acpi/acpica/evgpe.c
+++ b/drivers/acpi/acpica/evgpe.c
--- a/drivers/acpi/acpica/evregion.c
+++ b/drivers/acpi/acpica/evregion.c
--- a/drivers/acpi/acpica/evxfregn.c
+++ b/drivers/acpi/acpica/evxfregn.c
--- a/drivers/acpi/acpica/exfldio.c
+++ b/drivers/acpi/acpica/exfldio.c
--- a/drivers/acpi/acpica/hwxface.c
+++ b/drivers/acpi/acpica/hwxface.c
--- a/drivers/acpi/acpica/tbfadt.c
+++ b/drivers/acpi/acpica/tbfadt.c
--- a/drivers/acpi/acpica/utdecode.c
+++ b/drivers/acpi/acpica/utdecode.c
--- a/drivers/acpi/acpica/utglobal.c
+++ b/drivers/acpi/acpica/utglobal.c
--- a/drivers/acpi/apei/Kconfig
+++ b/drivers/acpi/apei/Kconfig
--- a/drivers/acpi/apei/cper.c
+++ b/drivers/acpi/apei/cper.c
--- a/drivers/acpi/apei/erst-dbg.c
+++ b/drivers/acpi/apei/erst-dbg.c
--- a/drivers/acpi/apei/erst.c
+++ b/drivers/acpi/apei/erst.c
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
--- a/drivers/acpi/battery.c
+++ b/drivers/acpi/battery.c
--- a/drivers/acpi/button.c
+++ b/drivers/acpi/button.c
--- a/drivers/acpi/ec_sys.c
+++ b/drivers/acpi/ec_sys.c
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
--- a/drivers/acpi/nvs.c
+++ b/drivers/acpi/nvs.c
--- a/drivers/acpi/osl.c
+++ b/drivers/acpi/osl.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/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_throttling.c
+++ b/drivers/acpi/processor_throttling.c
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
--- a/drivers/acpi/sleep.c
+++ b/drivers/acpi/sleep.c
--- a/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
--- a/drivers/ata/ahci.c
+++ b/drivers/ata/ahci.c
--- a/drivers/ata/ahci.h
+++ b/drivers/ata/ahci.h
--- a/drivers/ata/ata_piix.c
+++ b/drivers/ata/ata_piix.c
--- a/drivers/ata/libahci.c
+++ b/drivers/ata/libahci.c
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.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_amd.c
+++ b/drivers/ata/pata_amd.c
--- a/drivers/ata/pata_arasan_cf.c
+++ b/drivers/ata/pata_arasan_cf.c
--- a/drivers/ata/pata_at91.c
+++ b/drivers/ata/pata_at91.c
--- a/drivers/ata/pata_bf54x.c
+++ b/drivers/ata/pata_bf54x.c
--- a/drivers/ata/pata_cs5520.c
+++ b/drivers/ata/pata_cs5520.c
--- a/drivers/ata/pata_ixp4xx_cf.c
+++ b/drivers/ata/pata_ixp4xx_cf.c
--- a/drivers/ata/pata_mpiix.c
+++ b/drivers/ata/pata_mpiix.c
--- a/drivers/ata/pata_palmld.c
+++ b/drivers/ata/pata_palmld.c
--- a/drivers/ata/pata_rb532_cf.c
+++ b/drivers/ata/pata_rb532_cf.c
--- a/drivers/ata/pata_rz1000.c
+++ b/drivers/ata/pata_rz1000.c
--- a/drivers/ata/pata_sil680.c
+++ b/drivers/ata/pata_sil680.c
--- a/drivers/ata/pata_sis.c
+++ b/drivers/ata/pata_sis.c
--- a/drivers/ata/pata_triflex.c
+++ b/drivers/ata/pata_triflex.c
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.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_via.c
+++ b/drivers/ata/sata_via.c
--- a/drivers/atm/ambassador.c
+++ b/drivers/atm/ambassador.c
--- a/drivers/atm/firestream.c
+++ b/drivers/atm/firestream.c
--- a/drivers/atm/fore200e.h
+++ b/drivers/atm/fore200e.h
--- a/drivers/atm/horizon.c
+++ b/drivers/atm/horizon.c
--- a/drivers/atm/idt77252.c
+++ b/drivers/atm/idt77252.c
--- a/drivers/atm/idt77252.h
+++ b/drivers/atm/idt77252.h
--- a/drivers/atm/iphase.c
+++ b/drivers/atm/iphase.c
--- a/drivers/atm/lanai.c
+++ b/drivers/atm/lanai.c
--- a/drivers/atm/solos-pci.c
+++ b/drivers/atm/solos-pci.c
--- a/drivers/auxdisplay/cfag12864b.c
+++ b/drivers/auxdisplay/cfag12864b.c
--- a/drivers/base/Kconfig
+++ b/drivers/base/Kconfig
--- 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/power/runtime.c
+++ b/drivers/base/power/runtime.c
--- a/drivers/base/power/wakeup.c
+++ b/drivers/base/power/wakeup.c
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
--- a/drivers/base/syscore.c
+++ b/drivers/base/syscore.c
--- a/drivers/block/DAC960.c
+++ b/drivers/block/DAC960.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/cciss.h
+++ b/drivers/block/cciss.h
--- a/drivers/block/cciss_cmd.h
+++ b/drivers/block/cciss_cmd.h
--- a/drivers/block/cciss_scsi.c
+++ b/drivers/block/cciss_scsi.c
--- a/drivers/block/cpqarray.c
+++ b/drivers/block/cpqarray.c
--- a/drivers/block/drbd/drbd_actlog.c
+++ b/drivers/block/drbd/drbd_actlog.c
--- a/drivers/block/drbd/drbd_bitmap.c
+++ b/drivers/block/drbd/drbd_bitmap.c
--- a/drivers/block/drbd/drbd_int.h
+++ b/drivers/block/drbd/drbd_int.h
--- a/drivers/block/drbd/drbd_main.c
+++ b/drivers/block/drbd/drbd_main.c
--- a/drivers/block/drbd/drbd_nl.c
+++ b/drivers/block/drbd/drbd_nl.c
--- a/drivers/block/drbd/drbd_proc.c
+++ b/drivers/block/drbd/drbd_proc.c
--- a/drivers/block/drbd/drbd_receiver.c
+++ b/drivers/block/drbd/drbd_receiver.c
--- a/drivers/block/drbd/drbd_req.c
+++ b/drivers/block/drbd/drbd_req.c
--- a/drivers/block/drbd/drbd_req.h
+++ b/drivers/block/drbd/drbd_req.h
--- a/drivers/block/drbd/drbd_strings.c
+++ b/drivers/block/drbd/drbd_strings.c
--- a/drivers/block/drbd/drbd_vli.h
+++ b/drivers/block/drbd/drbd_vli.h
--- a/Show more
+++ b/Show more