diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 09:58:12 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2011-10-25 09:58:12 +0200 |
| commit | f6f12427844516bc8e9cf84f43aca7bbbaa48157 (patch) | |
| tree | c3ac710e02d65fc08629b25fcfba0e79e0092910 /drivers/hid/hid-sjoy.c | |
| parent | Merge branches 'acrux', 'logitech', 'multitouch', 'roccat' and 'wiimote' into... (diff) | |
| parent | HID: hid-magicmouse: Magic Trackpad has 1 button, not 2 (diff) | |
| download | linux-f6f12427844516bc8e9cf84f43aca7bbbaa48157.tar.xz linux-f6f12427844516bc8e9cf84f43aca7bbbaa48157.zip | |
Merge branch 'upstream-fixes' into for-linus
Conflicts:
drivers/hid/hid-wacom.c
Diffstat (limited to 'drivers/hid/hid-sjoy.c')
0 files changed, 0 insertions, 0 deletions