tree 3ff7bbcf2a476291f5536ea09b256c541c4456f3
parent 2cda64cf6998a1d10961f69e2ac79c69b6d37795
parent fc77dbd34c5c99bce46d40a2491937c3bcbd10af
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1456877445 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1456877445 -0800

Merge 4.5-rc6 into staging-next

We want the staging fixes in here as well.

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