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)
commit138a6d7ea2deb3080116a4f99019e181b62e5ce5
tree424622059405352935fbf1dde015a1e130b56198
parent4fc6069e7df873bda9baabe0fa9f0be23363159a
parent319e2e3f63c348a9b66db4667efa73178e18b17d
Merge 3.13-rc4 into char-misc-next

We want these fixes in here.
drivers/misc/mei/pci-me.c
drivers/misc/mic/host/mic_virtio.c
drivers/misc/mic/host/mic_x100.c