From: Linus Torvalds 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: next-20111004~107 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=0f86267b79bc6e357b8606077c7f70239045ea9c;p=karo-tx-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