OSDN Git Service

Merge 5.4-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Nov 2019 05:23:37 +0000 (06:23 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 11 Nov 2019 05:23:37 +0000 (06:23 +0100)
commitf0cb9b5dfd1a6014349354e63768500a860cad53
treeb18478292c622b7cfbc4f49dc52e1f3816ac1b99
parentb79967a27f347d39a6e0b85b49bd11963cacf5c1
parent31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c
Merge 5.4-rc7 into staging-next

We want the staging fixes in here, and it resolves some merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/adc/stm32-adc.c
drivers/iio/imu/inv_mpu6050/inv_mpu_core.c
drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h
drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c
drivers/staging/Kconfig
drivers/staging/Makefile