Dmitry Torokhov 041387d984 Manual merge with Linus (conflict in drivers/input/misc/wistron_bnts.c)		2005-12-20 23:03:50 -05:00
..
hp_sdc_rtc.c
Kconfig
m68kspkr.c
Makefile
pcspkr.c
sparcspkr.c
uinput.c
wistron_btns.c