Pull acpi_bus_register_driver into release branch
authorLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 01:28:57 +0000 (21:28 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jun 2006 01:28:57 +0000 (21:28 -0400)
commit69cd291c6bbc6647fe3783257c5a2e076e808f71
tree6f65a2d7d29228129cef09343c485aad64e3a3f1
parent35a5d9ed9fedb74c22cb19ff7d749289473144e0
parent06ea8e08ae7e7e450b6a78e7ce5e10b3c5f954ea
Pull acpi_bus_register_driver into release branch

Conflicts:

drivers/acpi/asus_acpi.c
drivers/acpi/scan.c
drivers/acpi/asus_acpi.c
drivers/acpi/scan.c
drivers/char/sonypi.c
include/acpi/acpi_bus.h