OSDN Git Service

Merge 5.6-rc7 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2020 07:01:20 +0000 (08:01 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 23 Mar 2020 07:01:20 +0000 (08:01 +0100)
commit6203da9803017701da5782998157d9826215059d
tree1d754f139ac25c643e88f429966606d3b44e431f
parent3017e587e36819f87e53d3c8751afdf987c1f542
parent16fbf79b0f83bc752cee8589279f1ebfe57b3b6e
Merge 5.6-rc7 into staging-next

We need the staging/iio fixes in here as well

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/iio/accel/st_accel_i2c.c
drivers/iio/light/vcnl4000.c
drivers/iio/trigger/stm32-timer-trigger.c
drivers/staging/speakup/main.c
drivers/staging/wfx/Documentation/devicetree/bindings/net/wireless/siliabs,wfx.txt
drivers/staging/wfx/sta.c