Merge branch 'testing-alchark' into ltv

Conflicts:
	Documentation/devicetree/bindings/serial/vt8500-uart.txt
	arch/arm/boot/dts/wm8850.dtsi
	drivers/input/serio/Kconfig
	drivers/mtd/devices/Makefile
	drivers/mtd/devices/wmt_sflash.c
	drivers/pinctrl/vt8500/pinctrl-wmt.c
	drivers/video/Kconfig
	drivers/video/wm8505fb.c

Signed-off-by: Helmut Stengele <lautriv@coldplug.net>