tree 1962ab81537b7155d185f4b0b06c0323ff4dc509
parent 3c9a6793bde1feb368cd6ef113c08a40a37f7517
parent a99cde438de0c4c0cecc1d1af1a55a75b10bfdef
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1467645303 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1467645303 -0700

Merge 4.7-rc6 into staging-next

We want the staging fixes in here as well.

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