tree 6016c386c321cd6a3e8575e01ed9f10834fc5081
parent 34bcfdac8c92cc7971254ba5856afd12047c50b2
parent 9d3cce1e8b8561fed5f383d22a4d6949db4eadbe
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1531724694 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1531724694 +0200

Merge 4.18-rc5 into char-misc-next

We want the char-misc fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>