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

Input: atlas_btns - add support for loadable keymaps

2008-01-21 01:11:06 -05:00

cobalt_btns.c

Input: add MODULE_ALIAS() to hotpluggable platform modules

2008-04-24 13:24:59 -04:00

hp_sdc_rtc.c

[PATCH] mark struct file_operations const 3

2007-02-12 09:48:45 -08:00

ixp4xx-beeper.c

ixp4xx-beeper: add MODULE_ALIAS

2008-03-28 14:45:22 -07:00

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

get rid of input BIT* duplicate defines

2007-10-19 11:53:42 -07:00

Makefile

Input: add driver for Fujitsu application buttons

2008-01-21 01:11:07 -05:00

map_to_7segment.h

Input: move USB miscellaneous devices under drivers/input/misc

2007-05-08 01:41:29 -04:00

pcspkr.c

Use i8253.c lock for PC speaker on MIPS, too.

2007-11-02 19:39:18 -07:00

powermate.c

Input: replace remaining __FUNCTION__ occurrences

2008-05-16 14:45:58 -04:00

sparcspkr.c

input: Rewrite sparcspkr device probing.

2008-04-26 21:41:22 -07:00

uinput.c

Input: pull input.h into uinpit.h

2007-05-03 00:55:34 -04:00

wistron_btns.c

leds: Standardise LED naming scheme

2008-02-07 09:47:00 +00:00

yealink.c

Input: replace remaining __FUNCTION__ occurrences

2008-05-16 14:45:58 -04:00

yealink.h

Input: move USB miscellaneous devices under drivers/input/misc

2007-05-08 01:41:29 -04:00