diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:48:15 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-07-28 10:48:15 +0200 |
| commit | e82a82c19f4272ea5437cc76e5711b98e2ee6223 (patch) | |
| tree | 056b36e32324238a895c02bb5a6c13c89cb20f10 /scripts | |
| parent | 819d64e51d6260f8f7ef352cf42fc1ea67a0f7db (diff) | |
| parent | b5d9427549be859dd42c5a6c635bc09d1d07b00b (diff) | |
| parent | d9f448e3d71f3a703977196fa73be533b4b85adc (diff) | |
| parent | 67f8ecc550b5bda03335f845dc869b8501d25fd0 (diff) | |
| parent | ddfe8483e9a938ed82b411e1f47c3249f0567658 (diff) | |
Merge branches 'for-4.8/alps', 'for-4.8/apple', 'for-4.8/i2c-hid', 'for-4.8/uhid-offload-hid-device-add' and 'for-4.8/upstream' into for-linus