tree 816a7f35028762976f5d4bc4df172e407c4bcbe2
parent b8d1f261fe7e4967593a5637d62991b6197a03f8
parent 52721d9d3334c1cb1f76219a161084094ec634dc
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1437423688 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1437423688 -0700

Merge 4.2-rc3 into staging-next

We need the staging fixes in here as well.

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