From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 3 Oct 2011 19:54:56 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
X-Git-Tag: v3.1-rc9~7
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=0f86267b79bc6e357b8606077c7f70239045ea9c;p=linux.git

Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux

* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (coretemp) Avoid leaving around dangling pointer
  hwmon: (coretemp) Fixup platform device ID change
---

0f86267b79bc6e357b8606077c7f70239045ea9c