| commit | 9508d80530add1281ac4d5032ab650eaf0b41aa4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 02 16:39:50 2011 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Jul 02 16:39:50 2011 -0700 |
| tree | 8615c6e0864d8917f4eda4d96e1af69c635ce4f6 | |
| parent | 8aa7ad9018d7fa1e52d2ee350a2f62c5485d3fec [diff] | |
| parent | 0e502ec889d33bfcb348e420d7e105bc61c45eb4 [diff] |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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