Merge 3.14-rc3 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Feb 2014 16:09:40 +0000 (08:09 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 18 Feb 2014 16:09:40 +0000 (08:09 -0800)
commitba4b60e85d6c5fc2242fd24e131a47fb922e5d89
tree6be918ce3924d0677bc1029f7d1255fef48a8f85
parent5dba4c56dfa660a85dc8e897990948cdec3734bf
parent6d0abeca3242a88cab8232e4acd7e2bf088f3bc2
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>
arch/arm/boot/dts/sun4i-a10.dtsi
arch/arm/boot/dts/sun5i-a10s.dtsi
drivers/misc/mei/client.c
drivers/vme/bridges/vme_ca91cx42.c
drivers/vme/bridges/vme_tsi148.c
include/linux/hyperv.h