diff options
| author | Jiri Kosina | 2015-04-13 23:43:34 +0200 |
|---|---|---|
| committer | Jiri Kosina | 2015-04-13 23:43:34 +0200 |
| commit | 2e455c27bddbf8cf6d1039daea40de8e6865c453 (patch) | |
| tree | 3fd892aeae61b105e3c5c979550aabf54109a656 /drivers/infiniband/Makefile | |
| parent | Merge branches 'for-4.0/upstream-fixes', 'for-4.1/genius', 'for-4.1/huion-ucl... (diff) | |
| parent | HID: sensor: Update document for custom sensor (diff) | |
| download | kernel-qcow2-linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.gz kernel-qcow2-linux-2e455c27bddbf8cf6d1039daea40de8e6865c453.tar.xz kernel-qcow2-linux-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 'drivers/infiniband/Makefile')
0 files changed, 0 insertions, 0 deletions