Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv...
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2015 18:09:01 +0000 (10:09 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 10 Nov 2015 18:09:01 +0000 (10:09 -0800)
commit6aabef681df96b851b4a11459520d4a20ab1cae4
treef23acdd2c2d732b70937c1db3c9e6a9a716689e1
parent1eb196c3c01f364d6cd3e8c0e16dc4702fdaffd9
parentba953391e03fd3b9eb0db19814cadb201574b4e2
Merge branch 'hwmon-for-linus' of git://git./linux/kernel/git/jdelvare/staging

Pull tiny hwmon update from Jean Delvare.

* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging:
  hwmon: (k10temp) Remove duplicate pci-id define