Merge branch 'acpi-modparam' into release

Conflicts:
	drivers/acpi/Makefile

Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
Len Brown 2009-04-05 01:45:50 -04:00
commit edd84690d1
4 changed files with 26 additions and 33 deletions