]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Aug 2010 15:41:18 +0000 (08:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 25 Aug 2010 15:41:18 +0000 (08:41 -0700)
commitb20c002247554a7932de14add923f347f9745514
tree193391b65af88f56ffc440a37cac29f363e79a8c
parent61d45d2b2dfdabf7f26d6a71175c7de2e22a2e73
parentedde1d623d1eb3de28506fa649de9c7deb15e6e1
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  MAINTAINERS: hwmon/coretemp: Change maintainers
  hwmon: (k8temp) Differentiate between AM2 and ASB1
  hwmon: (ads7871) Fix ads7871_probe error paths
  hwmon: (coretemp) Fix harmless build warning