]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge 5.0-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Jan 2019 07:13:52 +0000 (08:13 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 28 Jan 2019 07:13:52 +0000 (08:13 +0100)
commitfdddcfd9c93c6db006004fa5ba7fd9380e721c3f
tree4d029f3bd29be07eac87bcfad3bd7e3012fb9428
parentf9f7bb9e0a0ca33f65a3deae9ec5e07266908fc5
parentf17b5f06cb92ef2250513a1e154c47b78df07d40
Merge 5.0-rc4 into char-misc-next

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

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
arch/powerpc/platforms/chrp/setup.c
drivers/misc/mic/vop/vop_main.c
drivers/ntb/hw/mscc/ntb_hw_switchtec.c