Dmitry Torokhov 95d465fd75 Manual merge with Linus. ... Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c		2006-04-02 00:08:05 -05:00
..
amikbd.c
atkbd.c
corgikbd.c
hil_kbd.c	Manual merge with Linus.	2006-04-02 00:08:05 -05:00
hilkbd.c
hpps2atkbd.h
Kconfig
lkkbd.c
locomokbd.c
Makefile
maple_keyb.c
newtonkbd.c
spitzkbd.c
sunkbd.c
xtkbd.c