Merge 4.10-rc7 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2017 08:39:13 +0000 (09:39 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2017 08:39:13 +0000 (09:39 +0100)
commit17fa87fe5a5141d3c082c5c91e950aca9e0ec701
tree5aea2ff6b9b16b49585684c5f2ce404fe444a9ba
parent3b28f4f2c2c7fcb6770cdfe5e8cd284ee1bc9783
parentd5adbfcd5f7bcc6fa58a41c5c5ada0e5c826ce2c
Merge 4.10-rc7 into char-misc-next

We want the hv and other fixes in here as well to handle merge and
testing issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
MAINTAINERS
drivers/hv/ring_buffer.c
include/linux/hyperv.h
init/Kconfig