Merge 4.13-rc5 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Aug 2017 20:29:31 +0000 (13:29 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Aug 2017 20:29:31 +0000 (13:29 -0700)
commitd985524680b77a1cf90738db9a2d72065a746afa
tree101857c3e59f9238b0c7d4bbbf58e46476957387
parent2007eafd9df71375d443192bbbe7aa2175992477
parentef954844c7ace62f773f4f23e28d2d915adc419f
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>
MAINTAINERS
drivers/misc/mei/pci-me.c