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)
commit07bf280521bb06bc8e64f0b998fc391253fcb959
tree323f0cb360d890889eacc7344e1dd42a2fb3ef68
parent1ae5ec903f71c0ffa583ec54d17415892036ee18
parent53eac700b0df1fef8c957b9eedfd7f48120425e3
Merge branch 'power-resource' into release
drivers/acpi/scan.c