diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:23:43 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2015-06-22 16:23:43 +0200 |
| commit | ec3b34e1975670e68be3abff76f56dbb41dd417c (patch) | |
| tree | 949f0bb7a3eb9a1f06bb92852b334f17397e4667 /drivers/hid/hid-lenovo.c | |
| parent | 817a3125819983956bb8a22455a569aac4e8ea34 (diff) | |
| parent | 3e48138c2c66d8ff7d96c87a0535cd50078c742f (diff) | |
| parent | 181a8b911dd26cd44dc7283d7953a2e138842767 (diff) | |
| parent | 81bb773faed7f5f0e82f14cdfcfe4e89fbea0e19 (diff) | |
| parent | 10e87dc42a086c256b25334b6c1c89214feba9a7 (diff) | |
| parent | 30ee72f0d28721da4bbe2be850fcd0bd269f238f (diff) | |
| parent | 6e5e9a06a206010eabd19b523fd0833c51afc0b0 (diff) | |
| parent | b2723eb73c6dc014980beb0f3e5f47d6cac57939 (diff) | |
| parent | 2a6cdbdd4cc0da0b0190b9a43648dff7b44adc0a (diff) | |
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