Merge 3.14-rc3 into char-misc-next

We need the fixes here for future mei and other patches.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc arch/arm/boot/dts/sun4i-a10.dtsi
Simple merge

diff --cc arch/arm/boot/dts/sun5i-a10s.dtsi
Simple merge

diff --cc drivers/misc/mei/client.c
Simple merge

diff --cc drivers/vme/bridges/vme_ca91cx42.c
Simple merge

diff --cc drivers/vme/bridges/vme_tsi148.c
Simple merge

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