From: Len Brown <len.brown@intel.com>
Date: Thu, 7 Feb 2008 08:31:17 +0000 (-0500)
Subject: Merge branches 'release' and 'hwmon-conflicts' into release
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=299cfe38081bea6dcd8b882375f6f65a980bccf9;p=deliverable%2Flinux.git

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

299cfe38081bea6dcd8b882375f6f65a980bccf9