| commit | f0cb9b5dfd1a6014349354e63768500a860cad53 | [log] [tgz] |
|---|---|---|
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Nov 11 06:23:37 2019 +0100 |
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | Mon Nov 11 06:23:37 2019 +0100 |
| tree | b18478292c622b7cfbc4f49dc52e1f3816ac1b99 | |
| parent | b79967a27f347d39a6e0b85b49bd11963cacf5c1 [diff] | |
| parent | 31f4f5b495a62c9a8b15b1c3581acd5efeb9af8c [diff] |
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>