summaryrefslogtreecommitdiffstats
path: root/drivers/hid/Makefile
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2016-12-14 10:12:26 +0100
committerJiri Kosina <jkosina@suse.cz>2016-12-14 10:12:26 +0100
commit96e132ebc0a162c643e0e6e6f1f85c3be3355715 (patch)
tree4d73c0424436ef8915de310ba2fbaee95ee123e2 /drivers/hid/Makefile
parent9ce12d8be12c94334634dd57050444910415e45f (diff)
parent13c28b029708d934dc80f77f83f85790f264080a (diff)
parent8cd16166b0002df427ed39e4970e0be4830199b2 (diff)
parent608ad1848b417f4b5771573ca9bfb811fcda3536 (diff)
parentf8690450f3d0d415f42c94f7e69258d8ba54ff29 (diff)
parentb897f6db3ae2cd9a42377f8b1865450f34ceff0e (diff)
parent594312b88b0f451912c964c7ff2c0eaa71ad41b4 (diff)
parentde66a1a04c25f2560a8dca7a95e2a150b0d5e17e (diff)
parent9c5dcd723171ad96f9e25ebf69514b74577cade7 (diff)
parentc60fa555b11b25386b355c141d90cbee361c3eec (diff)
parentc9cfb2aca26505729fc37716038c692208b2a8c9 (diff)
downloadlinux-96e132ebc0a162c643e0e6e6f1f85c3be3355715.tar.bz2
Merge branches 'for-4.10/asus', 'for-4.10/cp2112', 'for-4.10/i2c-hid-nopower', 'for-4.10/intel-ish', 'for-4.10/mayflash', 'for-4.10/microsoft-surface-3', 'for-4.10/multitouch', 'for-4.10/sony', 'for-4.10/udraw-ps3', 'for-4.10/upstream' and 'for-4.10/wacom/generic' into for-linus