| commit | 310eb776501af8412c570c4bcddc9ab5cecf3d7a | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 20 11:16:53 2012 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Fri Apr 20 11:16:53 2012 -0700 |
| tree | 26c205905566fabbae0559605c46df3efb086fb8 | |
| parent | 277b5fb35b770792f89fbe50df03daddb3fa9521 [diff] | |
| parent | 1196573fe493aeeb826468157313ee84ffbc59f3 [diff] |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging Pyll hwmon fixes from Guenter Roeck: "Two patches: Fix build warning in ads1015 driver, and fix bogus power values with current BIOSes in fam15h_power driver." * tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: hwmon: (ads1015) Fix build warning hwmon: fam15h_power: fix bogus values with current BIOSes