diff options
| author | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:27:54 +0200 |
|---|---|---|
| committer | Jiri Kosina <jkosina@suse.cz> | 2010-08-04 15:27:54 +0200 |
| commit | 9929ffed889b4861b52ba648a44fa4add945c4d1 (patch) | |
| tree | 3cca02ae6b6616cc9a204b762aab349fcfa3aefe /drivers/hid/Makefile | |
| parent | Merge branch 'upstream' into for-linus (diff) | |
| parent | Revert "HID: add support for the Wacom Intuos 4 wireless" (diff) | |
| download | linux-9929ffed889b4861b52ba648a44fa4add945c4d1.tar.xz linux-9929ffed889b4861b52ba648a44fa4add945c4d1.zip | |
Merge branch 'upstream-fixes' into for-linus
Conflicts:
drivers/hid/hid-ids.h
Diffstat (limited to 'drivers/hid/Makefile')
0 files changed, 0 insertions, 0 deletions