diff options
| author |   Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:32:31 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-05-22 11:32:31 +0200 |
| commit | 56ccd186f1837dd418cd094f0e96b3196bbab9ef (patch) | |
| tree | 195cdd3973a1288eb84f51f0ec28a947b333c2c5 /scripts | |
| parent | Merge branches 'device-groups', 'logitech' and 'multitouch' into for-linus (diff) | |
| parent | HID: uclogic: Add support for UC-Logic TWHL850 (diff) | |
| download | linux-dev-56ccd186f1837dd418cd094f0e96b3196bbab9ef.tar.xz linux-dev-56ccd186f1837dd418cd094f0e96b3196bbab9ef.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions