summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-10 10:09:01 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-10 10:09:01 -0800
commit6aabef681df96b851b4a11459520d4a20ab1cae4 (patch)
treef23acdd2c2d732b70937c1db3c9e6a9a716689e1 /kernel
parent1eb196c3c01f364d6cd3e8c0e16dc4702fdaffd9 (diff)
parentba953391e03fd3b9eb0db19814cadb201574b4e2 (diff)
downloadtalos-obmc-linux-6aabef681df96b851b4a11459520d4a20ab1cae4.tar.gz
talos-obmc-linux-6aabef681df96b851b4a11459520d4a20ab1cae4.zip
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
Diffstat (limited to 'kernel')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud