diff options
author | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:43:34 +0200 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2015-04-13 23:43:34 +0200 |
commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 (patch) | |
tree | 3fd892aeae61b105e3c5c979550aabf54109a656 /samples | |
parent | Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-uclogic-merge', 'for-4.1/i2c-hid', 'for-4.1/kconfig-drop-expert-dependency', 'for-4.1/logitech', 'for-4.1/multitouch', 'for-4.1/rmi', 'for-4.1/sony', 'for-4.1/upstream' and 'for-4.1/wacom' into for-linus (diff) | |
parent | HID: sensor: Update document for custom sensor (diff) | |
download | linux-dev-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.xz linux-dev-2e455c27bddbf8cf6d1039daea40de8e6865c453.zip |
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
Diffstat (limited to 'samples')
0 files changed, 0 insertions, 0 deletions