Merge branch 'char-misc-linus' into char-misc-next

We want the mei change here to allow future mei patches to apply
properly.

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