| commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 | [log] [tgz] |
|---|---|---|
| author | Jiri Kosina <jkosina@suse.cz> | Mon Apr 13 23:43:34 2015 +0200 |
| committer | Jiri Kosina <jkosina@suse.cz> | Mon Apr 13 23:43:34 2015 +0200 |
| tree | 3fd892aeae61b105e3c5c979550aabf54109a656 | |
| parent | 05f6d02521d4c7a656c5135d6d81c345ce531ac0 [diff] | |
| parent | b2eafd7282fdfd148fc09032540b0ff42bfedfbf [diff] |
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