Merge 4.13-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Aug 2017 13:26:48 +0000 (15:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Aug 2017 13:26:48 +0000 (15:26 +0200)
commit8439a69e72888daa7d2667980efaf20d8bbe7b20
treeff262847ff4f6797c9df882379ea0498a8822a18
parentb9920ca3b53728aaa836f138f74ebb37776b9f57
parentcc4a41fe5541a73019a864883297bd5043aa6d98
Merge 4.13-rc7 into staging-next

We want the staging and iio fixes in here to handle the merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/adc/ina2xx-adc.c
drivers/iio/adc/stm32-adc-core.c
drivers/iio/magnetometer/st_magn_core.c
drivers/iio/trigger/stm32-timer-trigger.c
drivers/staging/rtl8188eu/os_dep/usb_intf.c