This pulls in the fixes in that branch that are needed here as well.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>