From: Len Brown <len.brown@intel.com>
Date: Fri, 16 Jun 2006 01:28:57 +0000 (-0400)
Subject: Pull acpi_bus_register_driver into release branch
X-Git-Tag: v2.6.18-rc1~1081^2~19^2~10
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=69cd291c6bbc6647fe3783257c5a2e076e808f71;p=pandora-kernel.git

Pull acpi_bus_register_driver into release branch

Conflicts:

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

69cd291c6bbc6647fe3783257c5a2e076e808f71
Reading git-diff-tree failed