diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:37:51 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2012-10-01 14:37:51 +0200 |
| commit | a3cbe10e474ac8c2c30a151a7812e15e4cfa2775 (patch) | |
| tree | f245dd77a3dede97a80f8369d984334b56220752 /firmware/sb16 | |
| parent | Merge branches 'from-henrik', 'hidraw', 'logitech', 'picolcd', 'ps3', 'uclogi... (diff) | |
| parent | HID: keep dev_rdesc unmodified and use it for comparisons (diff) | |
| download | linux-a3cbe10e474ac8c2c30a151a7812e15e4cfa2775.tar.xz linux-a3cbe10e474ac8c2c30a151a7812e15e4cfa2775.zip | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/usbhid/hid-quirks.c
Diffstat (limited to 'firmware/sb16')
0 files changed, 0 insertions, 0 deletions