Merge 3.12-rc3 into char-misc-next

We need/want the mei fixes in here so we can apply other updates that
are depending on them.

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

diff --cc drivers/hv/connection.c
Simple merge

diff --cc drivers/hv/hv_util.c
Simple merge

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

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

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

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

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