Commits
![Jiri Kosina](https://secure.gravatar.com/avatar/88ce3b2d1eee3c76c0af0a1487fc8e64.jpg?s=96&d=mm)
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