We want the fixes in Linus's tree in here as well.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>