tree 101857c3e59f9238b0c7d4bbbf58e46476957387
parent 2007eafd9df71375d443192bbbe7aa2175992477
parent ef954844c7ace62f773f4f23e28d2d915adc419f
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1502742571 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1502742571 -0700

Merge 4.13-rc5 into char-misc-next

We want the firmware, and other changes, in here as well.

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