95d465fd75
Conflicts: arch/powerpc/kernel/setup-common.c drivers/input/keyboard/hil_kbd.c drivers/input/mouse/hil_ptr.c |
||
---|---|---|
.. | ||
acecad.c | ||
aiptek.c | ||
appletouch.c | ||
ati_remote2.c | ||
ati_remote.c | ||
fixp-arith.h | ||
hid-core.c | ||
hid-debug.h | ||
hid-ff.c | ||
hid-input.c | ||
hid-lgff.c | ||
hid-tmff.c | ||
hid.h | ||
hiddev.c | ||
itmtouch.c | ||
kbtab.c | ||
Kconfig | ||
keyspan_remote.c | ||
Makefile | ||
map_to_7segment.h | ||
mtouchusb.c | ||
pid.c | ||
pid.h | ||
powermate.c | ||
touchkitusb.c | ||
usbkbd.c | ||
usbmouse.c | ||
wacom.c | ||
xpad.c | ||
yealink.c | ||
yealink.h |