Dmitry Torokhov 15439dd37f Merge branch 'for-linus' into next ... Conflicts: drivers/input/mouse/appletouch.c		2008-06-17 12:02:44 -04:00
..
apanel.c	Input: apanel - remove duplicate include	2008-05-27 01:38:45 -04:00
ati_remote2.c	Input: replace remaining __FUNCTION__ occurrences	2008-05-16 14:45:58 -04:00
ati_remote.c	Input: replace remaining __FUNCTION__ occurrences	2008-05-16 14:45:58 -04:00
atlas_btns.c
cobalt_btns.c
hp_sdc_rtc.c
ixp4xx-beeper.c
Kconfig	Input: pcspkr - remove negative dependency on snd-pcsp	2008-06-06 00:22:50 -04:00
keyspan_remote.c	Input: replace remaining __FUNCTION__ occurrences	2008-05-16 14:45:58 -04:00
m68kspkr.c
Makefile
map_to_7segment.h
pcspkr.c
powermate.c	Input: replace remaining __FUNCTION__ occurrences	2008-05-16 14:45:58 -04:00
sparcspkr.c
uinput.c
wistron_btns.c
yealink.c	Input: replace remaining __FUNCTION__ occurrences	2008-05-16 14:45:58 -04:00
yealink.h