3c803e8e2f
git did actually warn me about the fact that I hadn't actually done an "update-cache" on these two files, but the warning was at the bottom of a list of all the files that _did_ change in the merge, so I never noticed. My bad. |
||
|---|---|---|
| .. | ||
| gameport | ||
| joystick | ||
| keyboard | ||
| misc | ||
| mouse | ||
| serio | ||
| touchscreen | ||
| evbug.c | ||
| evdev.c | ||
| input.c | ||
| joydev.c | ||
| Kconfig | ||
| Makefile | ||
| mousedev.c | ||
| power.c | ||
| tsdev.c | ||