Merge branch 'thinkpad-acpi' into release
authorLen Brown <len.brown@intel.com>
Fri, 24 Apr 2009 05:34:37 +0000 (01:34 -0400)
committerLen Brown <len.brown@intel.com>
Fri, 24 Apr 2009 05:34:37 +0000 (01:34 -0400)

Trivial merge