Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input...
Dmitry Torokhov [Tue, 28 Dec 2010 01:33:20 +0000 (17:33 -0800)]
1  2 
drivers/input/evdev.c
drivers/input/input.c
drivers/input/mouse/synaptics.c
include/linux/input.h

Simple merge
Simple merge
Simple merge
Simple merge