]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commit
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)
commit0f86267b79bc6e357b8606077c7f70239045ea9c
treef31af517e9b40e360180dfb4679de866a2ad2bb2
parent0d617928f5f5426f6e40edaacbfa80e73d67e0cd
parent20ecb499f64a7e8e7fe03f6098ab25c71b7a6481
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