diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:38:03 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2016-05-17 12:38:03 +0200 |
| commit | 27fd38c5226ed0f1712d071880fa8e739eb78650 (patch) | |
| tree | 1e3b5714cb7828efc2b97375de1edc6006ee1af6 | |
| parent | eff6ca97998386447b795362cc20213114af2870 (diff) | |
| parent | b94f7d5ddf1b114e66d9bcc07d0ead080470383b (diff) | |
| parent | 8f507c8b0fa5d679e2957aad0e5ecd47675fca9a (diff) | |
| parent | bbf4ac9cfa9b681e3b657699f39fc855408904b8 (diff) | |
Merge branches 'for-4.6/upstream-fixes', 'for-4.7/asus', 'for-4.7/hidraw' and 'for-4.7/thingm' into for-linus