Merge branches 'bugzilla-13121+', 'bugzilla-13233', 'redhat-bugzilla-500311', 'pci...

diff --combined drivers/acpi/video.c
index 6d897bb,810cca9,810cca9,810cca9,a79b885,810cca9..1bdfb37
--- 1/drivers/acpi/video.c
--- 2/drivers/acpi/video.c
--- 3/drivers/acpi/video.c
--- 4/drivers/acpi/video.c
--- 5/drivers/acpi/video.c
--- 6/drivers/acpi/video.c
+++ b/drivers/acpi/video.c
@@@@@@@ -570,22 -570,6 -570,6 -570,6 -570,6 -570,6 +570,22 @@@@@@@ static struct dmi_system_id video_dmi_t
                DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5710Z"),
                },
        },
 +++++  {
 +++++   .callback = video_set_bqc_offset,
 +++++   .ident = "eMachines E510",
 +++++   .matches = {
 +++++          DMI_MATCH(DMI_BOARD_VENDOR, "EMACHINES"),
 +++++          DMI_MATCH(DMI_PRODUCT_NAME, "eMachines E510"),
 +++++          },
 +++++  },
 +++++  {
 +++++   .callback = video_set_bqc_offset,
 +++++   .ident = "Acer Aspire 5315",
 +++++   .matches = {
 +++++          DMI_MATCH(DMI_BOARD_VENDOR, "Acer"),
 +++++          DMI_MATCH(DMI_PRODUCT_NAME, "Aspire 5315"),
 +++++          },
 +++++  },
        {}
      };
      
@@@@@@@ -2350,7 -2334,7 -2334,7 -2334,7 -2334,7 -2334,7 +2350,7 @@@@@@@ static int __init acpi_video_init(void
        return acpi_video_register();
      }
      
---- -void __exit acpi_video_exit(void)
++++ +void acpi_video_exit(void)
      {
      
        acpi_bus_unregister_driver(&acpi_video_bus);