Merge branch 'acpi-modparam' into release
authorLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:45:50 +0000 (01:45 -0400)
committerLen Brown <len.brown@intel.com>
Sun, 5 Apr 2009 05:45:50 +0000 (01:45 -0400)
commitedd84690d15e4cb144cc60b754d4eaf8fac0a711
tree4fc645c52ad9eebcdf59a6ab32d534df121dd280
parent7c27fd19b6d985957424348361afa066ff4c74d8
parentae7d51517bc3b0fe10c6af38234ef0f92bbae6a4
Merge branch 'acpi-modparam' into release

Conflicts:
drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
drivers/acpi/Makefile
drivers/acpi/debug.c
drivers/acpi/power.c
drivers/acpi/system.c