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)
Conflicts:

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


Trivial merge