summaryrefslogtreecommitdiffstats
path: root/drivers/thermal/thermal-generic-adc.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-09 09:02:35 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2017-10-09 09:02:35 +0200
commit1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee (patch)
tree47da3feee8e263e8c9352c85cf518e624be3c211 /drivers/thermal/thermal-generic-adc.c
parentstaging: irda: au1k_ir.c fix warning: Prefer [subsystem eg: netdev]_info([sub... (diff)
parentLinux 4.14-rc4 (diff)
downloadlinux-1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee.tar.xz
linux-1236d6bb6e19fc72ffc6bbcdeb1bfefe450e54ee.zip
Merge 4.14-rc4 into staging-next
We want the staging/iio fixes in here as well to handle merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/thermal/thermal-generic-adc.c')
0 files changed, 0 insertions, 0 deletions