Merge remote-tracking branch 'mfd-lj/for-mfd-next'

diff --cc arch/arm/boot/dts/tegra20-colibri-512.dtsi
Simple merge

diff --cc drivers/gpio/Kconfig
Simple merge

diff --cc drivers/gpio/Makefile
Simple merge

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

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

diff --cc drivers/mfd/rtsx_pcr.c
Simple merge

diff --cc drivers/mfd/wm5110-tables.c
Simple merge

diff --cc drivers/staging/nvec/nvec.c
Simple merge

diff --cc sound/soc/fsl/Kconfig
Simple merge