Greg Kroah-Hartman f0cb9b5dfd 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>
2019-11-11 06:23:37 +01:00
..
2019-11-11 06:23:37 +01:00
2019-10-15 12:19:08 -07:00
2019-09-18 11:14:31 -07:00
2019-10-21 14:05:26 +02:00
2019-10-23 06:14:29 -04:00
2019-10-04 11:13:09 -07:00
2019-09-23 19:37:49 -07:00