tree 5ad08f6de205a14eeba1793aa641e6b25c22b2c1
parent 423de92f56bdfc3e68503af31e6ec041d59a6a25
parent c3b46c73264b03000d1e18b22f5caf63332547c9
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1461007456 +0900
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1461007456 +0900

Merge 4.6-rc4 into char-misc-next

We want the fixes in there to build off of for other dependant patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>