Merge 3.13-rc4 into char-misc-next

We want these fixes in here.

diff --cc drivers/misc/mei/pci-me.c
Simple merge

diff --cc drivers/misc/mic/host/mic_virtio.c
Simple merge

diff --cc drivers/misc/mic/host/mic_x100.c
Simple merge