summary refs log tree commit diff
path: root/drivers/virtio/virtio_pci_common.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-23 13:39:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-23 13:39:56 -0700
commit234a56c80a6aa7a05fec05d8b7184354d8765b48 (patch)
tree12f8a05b005ced034316a8c865b51cdbe3f79802 /drivers/virtio/virtio_pci_common.c
parenta57f14bac07f63118d947f53976d7f15c04b062a (diff)
parent761c1770f2bf36a323ab97e2e1780db4f9b8a6fe (diff)
downloadlinux-234a56c80a6aa7a05fec05d8b7184354d8765b48.tar.gz
Merge tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon updates from Guenter Roeck:

 - new driver for Microchip TC74

 - support for ncpXXwf104 added to ntc_thermistor driver

 - minor cleanup

* tag 'hwmon-for-linus-v4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: add driver for Microchip TC74
  hwmon: (ntc_thermistor) Improve precision of resistance calculation
  hwmon: (ntc_thermistor) fix iio raw to microvolts conversion
  hwmon: (atxp1) Drop auto-detection
  hwmon: (atxp1) Drop FSF mailing address
  hwmon: Allow compile test of GPIO consumers if !GPIOLIB
  hwmon: (sht15) Constify platform_device_id
  hwmon: (max197) Constify platform_device_id
  hwmon: (ntc_thermistor) Add support for ncpXXwf104
Diffstat (limited to 'drivers/virtio/virtio_pci_common.c')
0 files changed, 0 insertions, 0 deletions