Merge 4.6-rc7 into char-misc-testing

This resolves a merge issue with drivers/hv/ring_buffer.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2016-05-09 09:34:49 +02:00
commit 725d0123df
584 changed files with 6359 additions and 3282 deletions