diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 06:47:01 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-03-19 06:47:01 +0100 |
| commit | 73709e1af5163ebf5e9b0e18fe90b7e843657d36 (patch) | |
| tree | 91ca8b98187ba60e88f8df2e32147fdf651f159e | |
| parent | c26dd817d99bc50acf2667ee27c39414a7a6638e (diff) | |
| parent | c698ca5278934c0ae32297a8725ced2e27585d7f (diff) | |
Merge 4.16-rc6 into staging-next
We want the staging fixes in here as well to handle merge/test issues.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>