Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rydberg/input...

diff --cc drivers/input/evdev.c
Simple merge

diff --cc drivers/input/input.c
Simple merge

diff --cc drivers/input/mouse/synaptics.c
Simple merge

diff --cc include/linux/input.h
Simple merge