We want those fixes in here to resolve merge issues. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>