Merge branch 'for-4.1/sensor-hub' into for-linus
authorJiri Kosina <jkosina@suse.cz>
Mon, 13 Apr 2015 21:43:34 +0000 (23:43 +0200)
committerJiri Kosina <jkosina@suse.cz>
Mon, 13 Apr 2015 21:43:34 +0000 (23:43 +0200)
commit2e455c27bddbf8cf6d1039daea40de8e6865c453
tree3fd892aeae61b105e3c5c979550aabf54109a656
parent05f6d02521d4c7a656c5135d6d81c345ce531ac0
parentb2eafd7282fdfd148fc09032540b0ff42bfedfbf
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
12 files changed:
drivers/hid/Kconfig
drivers/hid/Makefile
drivers/hid/hid-sensor-hub.c
drivers/iio/accel/hid-sensor-accel-3d.c
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
drivers/iio/gyro/hid-sensor-gyro-3d.c
drivers/iio/light/hid-sensor-als.c
drivers/iio/light/hid-sensor-prox.c
drivers/iio/magnetometer/hid-sensor-magn-3d.c
drivers/iio/orientation/hid-sensor-incl-3d.c
drivers/iio/pressure/hid-sensor-press.c
include/linux/hid-sensor-hub.h