]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit57d2a20f02a925060b6a697050acf1af8c2e1346
treef23acdd2c2d732b70937c1db3c9e6a9a716689e1
parent183626618434151876507046ded689a51114b1b9
parentadd78962aa55cdc38a410e0dd779359224b8211a
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