Merge branch 'power' into release
commitf613984902b64cfb05599f9ba52c0af39cb4db6b
authorLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:15 +0000 (11 21:14 -0500)
committerLen Brown <len.brown@intel.com>
Wed, 12 Nov 2008 02:14:15 +0000 (11 21:14 -0500)
treed4ee7e29857dfbfc44fdf758420d906485698213
parent3e0fe364835cecc8560cf32bb9609f4c56c5d9fa
parent676962dac6e267ce7c13f73962208f9124a084bb
Merge branch 'power' into release
drivers/acpi/power.c