diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 11:59:04 +0400 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 11:59:04 +0400 |
| commit | b3aec7b686329e6bb65aa08c7f9458f7fd512f06 (patch) | |
| tree | 67ae55567b5747f32ddd76dd63621bd2ca756a88 /drivers/hid/hid-roccat-arvo.h | |
| parent | f6f12427844516bc8e9cf84f43aca7bbbaa48157 (diff) | |
| parent | 1bcc20675a1ac1ba47eaa201e02a89b0508e17b2 (diff) | |
| download | linux-b3aec7b686329e6bb65aa08c7f9458f7fd512f06.tar.xz | |
Merge branch 'upstream' into for-linus
Conflicts:
drivers/hid/hid-core.c
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/hid-roccat-arvo.h')
0 files changed, 0 insertions, 0 deletions