Pull trivial into test branch
authorLen Brown <len.brown@intel.com>
Sat, 3 Feb 2007 06:39:07 +0000 (01:39 -0500)
committerLen Brown <len.brown@intel.com>
Sat, 3 Feb 2007 06:39:07 +0000 (01:39 -0500)
commit6b259707d53f0f25f0b24318a0774f1ae7e7e92c
tree9f05353c2134d57607ee9780e3a35e56952ea2e8
parenta4144e451ce1951e8dad2aa8e2288f75ab745172
parentdb50342205deabaff9ce1fbe53d5ba351992fa08
Pull trivial into test branch

Conflicts:

drivers/acpi/scan.c

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/Kconfig
drivers/acpi/scan.c