| commit | 6aabef681df96b851b4a11459520d4a20ab1cae4 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 10 10:09:01 2015 -0800 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Tue Nov 10 10:09:01 2015 -0800 |
| tree | f23acdd2c2d732b70937c1db3c9e6a9a716689e1 | |
| parent | 1eb196c3c01f364d6cd3e8c0e16dc4702fdaffd9 [diff] | |
| parent | ba953391e03fd3b9eb0db19814cadb201574b4e2 [diff] |
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