Merge branch 'hwmon-for-linus' of git://github.com/groeck/linux
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 19:54:56 +0000 (12:54 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 3 Oct 2011 19:54:56 +0000 (12:54 -0700)
* 'hwmon-for-linus' of git://github.com/groeck/linux:
  hwmon: (coretemp) Avoid leaving around dangling pointer
  hwmon: (coretemp) Fixup platform device ID change


Trivial merge