Commits
Merge branch 'for-4.1/sensor-hub' into for-linus Conflicts: drivers/iio/common/hid-sensors/hid-sensor-trigger.c include/linux/hid-sensor-hub.h
Merge branch 'for-4.1/sensor-hub' into for-linus Conflicts: drivers/iio/common/hid-sensors/hid-sensor-trigger.c include/linux/hid-sensor-hub.h