15439dd37f
Conflicts: drivers/input/mouse/appletouch.c |
||
---|---|---|
.. | ||
ambakmi.c | ||
at32psif.c | ||
ct82c710.c | ||
gscps2.c | ||
hil_mlc.c | ||
hp_sdc_mlc.c | ||
hp_sdc.c | ||
i8042-io.h | ||
i8042-ip22io.h | ||
i8042-jazzio.h | ||
i8042-ppcio.h | ||
i8042-snirm.h | ||
i8042-sparcio.h | ||
i8042-x86ia64io.h | ||
i8042.c | ||
i8042.h | ||
Kconfig | ||
libps2.c | ||
maceps2.c | ||
Makefile | ||
parkbd.c | ||
pcips2.c | ||
q40kbd.c | ||
rpckbd.c | ||
sa1111ps2.c | ||
serio_raw.c | ||
serio.c | ||
serport.c |