Merge commit 'v3.1-rc4' into next

diff --cc drivers/input/misc/Kconfig
Simple merge

diff --cc drivers/input/misc/Makefile
Simple merge

diff --cc drivers/input/misc/ad714x-i2c.c
Simple merge

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