projects
/
platform
/
kernel
/
linux-3.10.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a882a4d
c3e40a9
)
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck...
author
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Apr 2012 02:50:56 +0000
(19:50 -0700)
committer
Linus Torvalds
<torvalds@linux-foundation.org>
Sat, 28 Apr 2012 02:50:56 +0000
(19:50 -0700)
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
Trivial merge