Merge 3.12-rc3 into char-misc-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:27:03 +0000 (18:27 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 30 Sep 2013 01:27:03 +0000 (18:27 -0700)
commitd7173493683853047d6efc8d4454c70469a7b033
tree8e6dac16d3104494b5cc2f33756c582ecdc3b753
parent80d26236c7c583ea2f43b68008ab7e067102c62c
parent15c03dd4859ab16f9212238f29dd315654aa94f6
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>
drivers/hv/connection.c
drivers/hv/hv_util.c
drivers/misc/mei/amthif.c
drivers/misc/mei/client.h
drivers/misc/mei/hbm.c
drivers/misc/mei/main.c
include/linux/hyperv.h