projects / cascardo / linux.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 25ed6a5 33688ab)
Merge 4.7-rc4 into staging-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jun 2016 15:25:44 +0000 (08:25 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 20 Jun 2016 15:25:44 +0000 (08:25 -0700)
commitaf52739b922f656eb1f39016fabaabe4baeda2e2
tree79a7aa810d0493cd0cf4adebac26d37f12e8b545tree | snapshot
parent25ed6a5e97809129a1bc852b6b5c7d03baa112c4commit | diff
parent33688abb2802ff3a230bd2441f765477b94cc89ecommit | diff
Merge 4.7-rc4 into staging-next

We want the fixes in here, and we can resolve a merge issue in
drivers/iio/industrialio-trigger.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
14 files changed:
MAINTAINERS diff1 | diff2 | blob | history
drivers/iio/accel/st_accel_core.c diff1 | diff2 | blob | history
drivers/iio/common/st_sensors/st_sensors_buffer.c diff1 | diff2 | blob | history
drivers/iio/common/st_sensors/st_sensors_core.c diff1 | diff2 | blob | history
drivers/iio/gyro/st_gyro_core.c diff1 | diff2 | blob | history
drivers/iio/humidity/am2315.c diff1 | diff2 | blob | history
drivers/iio/imu/bmi160/bmi160_core.c diff1 | diff2 | blob | history
drivers/iio/industrialio-trigger.c diff1 | diff2 | blob | history
drivers/iio/magnetometer/st_magn_core.c diff1 | diff2 | blob | history
drivers/iio/pressure/bmp280.c diff1 | diff2 | blob | history
drivers/iio/pressure/st_pressure_core.c diff1 | diff2 | blob | history
drivers/iio/proximity/as3935.c diff1 | diff2 | blob | history
drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd_cb.c diff1 | diff2 | blob | history
include/linux/iio/common/st_sensors.h diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.