Merge 4.19-rc7 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Oct 2018 13:33:21 +0000 (15:33 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 8 Oct 2018 13:33:21 +0000 (15:33 +0200)
commitba1cb318dcbfc9754acda9656262aea97ebe77e6
tree770fadb8b2c77da5d4dd9d33535b2d7adcdb02fd
parent8f523d6db7ed69f69720267af170c0719023f373
parent0238df646e6224016a45505d2c111a24669ebe21
Merge 4.19-rc7 into char-misc-next

We want the fixes in here as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/thunderbolt/icm.c
drivers/thunderbolt/nhi.c