Merge 3.5-rc7 into char-misc-next.

This lets us pick up the mei driver changes that we need in order to
handle future merge issues.

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

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

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

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