From: Greg Kroah-Hartman Date: Mon, 9 May 2016 07:34:49 +0000 (+0200) Subject: Merge 4.6-rc7 into char-misc-testing X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=725d0123dfff3d7b666cf57f5d29c50addfc99d3;p=openwrt%2Fstaging%2Fblogic.git 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 --- 725d0123dfff3d7b666cf57f5d29c50addfc99d3