Merge 4.6-rc7 into char-misc-testing
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:34:49 +0000 (09:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 9 May 2016 07:34:49 +0000 (09:34 +0200)
commit725d0123dfff3d7b666cf57f5d29c50addfc99d3
tree12ec63b2c3965033f30185b4b2f5f12039a9a242
parent8cd1f9d01cbf4f46eace90d9792e65a209c37d31
parent44549e8f5eea4e0a41b487b63e616cb089922b99
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>
MAINTAINERS