Merge branch 'power-resource' into release
authorLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:55:28 +0000 (04:55 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Jan 2011 09:55:28 +0000 (04:55 -0500)
1  2 
drivers/acpi/scan.c

Simple merge