Merge 4.2-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2015 18:10:05 +0000 (11:10 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 27 Jul 2015 18:10:05 +0000 (11:10 -0700)
commit6e64e22449023dc89dfb92c6f19d4c5b03f46889
treec0099a75238a2cdcedf005956963329eee0aac75
parent4ad2adc98f113d6c21d7bd365cd45ba88d4f7470
parentcbfe8fa6cd672011c755c3cd85c9ffd4e2d10a6f
Merge 4.2-rc4 into staging-next

We want the iio and other fixes in this branch as well.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/iio/magnetometer/bmc150_magn.c
drivers/iio/temperature/mlx90614.c