95d465fd75
Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c |
||
---|---|---|
.. | ||
amikbd.c | ||
atkbd.c | ||
corgikbd.c | ||
hil_kbd.c | ||
hilkbd.c | ||
hpps2atkbd.h | ||
Kconfig | ||
lkkbd.c | ||
locomokbd.c | ||
Makefile | ||
maple_keyb.c | ||
newtonkbd.c | ||
spitzkbd.c | ||
sunkbd.c | ||
xtkbd.c |