Merge 3.13-rc4 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2013 00:11:28 +0000 (16:11 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 17 Dec 2013 00:11:28 +0000 (16:11 -0800)
We want these fixes in here.

1  2 
drivers/misc/mei/pci-me.c
drivers/misc/mic/host/mic_virtio.c
drivers/misc/mic/host/mic_x100.c

Simple merge
Simple merge
Simple merge