Conflicts: drivers/hid/hid-core.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| hid-core.c | ||
| hid-pidff.c | ||
| hid-quirks.c | ||
| hiddev.c | ||
| usbhid.h | ||
| usbkbd.c | ||
| usbmouse.c | ||
Conflicts: drivers/hid/hid-core.c |
||
|---|---|---|
| .. | ||
| Kconfig | ||
| Makefile | ||
| hid-core.c | ||
| hid-pidff.c | ||
| hid-quirks.c | ||
| hiddev.c | ||
| usbhid.h | ||
| usbkbd.c | ||
| usbmouse.c | ||