Merge branch 'thinkpad-acpi' into release
authorLen Brown <len.brown@intel.com>
Fri, 16 Jan 2009 19:45:24 +0000 (14:45 -0500)
committerLen Brown <len.brown@intel.com>
Fri, 16 Jan 2009 19:45:24 +0000 (14:45 -0500)

Trivial merge