We want the fixes in there, and it resolves a merge issue with
drivers/iio/accel/bma180.c
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>