tree 788d036bfbc9c92fb7663588033f50d2d6f5c828
parent 392910cf3f8a0161d3da45d02ea17f2910d9193b
parent c02ed2e75ef4c74e41e421acb4ef1494671585e8
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1490598784 +0200
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1490598784 +0200

Merge 4.11-rc4 into char-misc-next

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

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