diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 19:50:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-04-27 19:50:56 -0700 |
| commit | 9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44 (patch) | |
| tree | fe0b16b755eca36435be7932ea9a922df4c87973 /arch/blackfin | |
| parent | a882a4d053847f9fb148905f416fd85b20bb88fa (diff) | |
| parent | c3e40a9972428d6e2d8e287ed0233a57a218c30f (diff) | |
| download | linux-3.10-9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44.tar.gz linux-3.10-9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44.tar.bz2 linux-3.10-9f7e2f9037ffa03f4c4cd6f19159a367e4e02f44.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon patches from Guenter Roeck:
- Fix build warning in ad7314 driver
- Fix pci_device_id array access in fam15h_power driver, introduced by
commit 00250ec90963 ("hwmon: fam15h_power: fix bogus values with
current BIOSes")
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (fam15h_power) Fix pci_device_id array
hwmon: (ad7314) Fix build warning
Diffstat (limited to 'arch/blackfin')
0 files changed, 0 insertions, 0 deletions