Merge branches 'release' and 'hwmon-conflicts' into release
authorLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)
committerLen Brown <len.brown@intel.com>
Thu, 7 Feb 2008 08:31:17 +0000 (03:31 -0500)

Trivial merge