Merge branch 'for-linus' into next

Merge for-linus branch to sync Elan touchscreen driver code.

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

diff --cc drivers/input/serio/i8042-x86ia64io.h
Simple merge

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

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