tree e567c1e908d158d6dce155cc5cf1b4eb8c78c514
parent 8976b6fd7a0060f72e20d5cec833c03d50874cd1
parent 443dea72d5f428170de6d6e3c4c1a1e2b7632b65
author Len Brown <len.brown@intel.com> 1202373077 -0500
committer Len Brown <len.brown@intel.com> 1202373077 -0500

Merge branches 'release' and 'hwmon-conflicts' into release