tree f31af517e9b40e360180dfb4679de866a2ad2bb2
parent 0d617928f5f5426f6e40edaacbfa80e73d67e0cd
parent 20ecb499f64a7e8e7fe03f6098ab25c71b7a6481
author Linus Torvalds <torvalds@linux-foundation.org> 1317671696 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1317671696 -0700

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