Pull acpi_bus_register_driver into release branch

Conflicts:

	drivers/acpi/asus_acpi.c
	drivers/acpi/scan.c

diff --cc drivers/acpi/asus_acpi.c
index 1a545489e8597b13890a407f923141cc98b1917e,523fff9cf148447d331ce4fda4651a43990e2741..90eb3c5a15cae8eae0d0d0acd296a39a838844ca
--- 1/drivers/acpi/asus_acpi.c
--- 2/drivers/acpi/asus_acpi.c
+++ b/drivers/acpi/asus_acpi.c
@@@ -1119,7 -1119,9 +1119,9 @@@ static int asus_hotk_check(void
        return result;
  }
  
 -static int __init asus_hotk_add(struct acpi_device *device)
+ static int asus_hotk_found;
+ 
 +static int asus_hotk_add(struct acpi_device *device)
  {
        acpi_status status = AE_OK;
        int result;

diff --cc drivers/acpi/scan.c
Simple merge

diff --cc drivers/char/sonypi.c
Simple merge

diff --cc include/acpi/acpi_bus.h
Simple merge