From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 2 Jul 2011 23:39:50 +0000 (-0700)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groec... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9508d80530add1281ac4d5032ab650eaf0b41aa4;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/groeck/staging

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/staging:
  hwmon: (pmbus) Auto-detect temp2 and temp3 registers/attributes
  hwmon: (pmbus) Improve fan detection
  hwmon: (adm1275) Free allocated memory if probe function fails
  hwmon: (pmbus) Drop check for PMBus revision register in probe function
---

9508d80530add1281ac4d5032ab650eaf0b41aa4