diff options
Merge branches 'for-4.2/i2c-hid', 'for-4.2/lenovo', 'for-4.2/plantronics', 'for-4.2/rmi', 'for-4.2/sensor-hub', 'for-4.2/sjoy', 'for-4.2/sony' and 'for-4.2/wacom' into for-linus
Conflicts:
drivers/hid/wacom_wac.c
index : openslx/kernel-qcow2-linux.git | ||
In-kernel qcow2 (Kernel part) | OpenSLX |
summaryrefslogtreecommitdiffstats |