Merge 4.4-rc2 into staging-next

We want those fixes in here to resolve merge issues.

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