We want the driver fixes in here and this resolves a merge issue with
the binder driver.
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>