From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 10 Nov 2015 18:09:01 +0000 (-0800)
Subject: Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelv... 
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1050.54~7143
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=6aabef681df96b851b4a11459520d4a20ab1cae4;p=mirror_ubuntu-artful-kernel.git

Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/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
---

6aabef681df96b851b4a11459520d4a20ab1cae4