tree 6be918ce3924d0677bc1029f7d1255fef48a8f85
parent 5dba4c56dfa660a85dc8e897990948cdec3734bf
parent 6d0abeca3242a88cab8232e4acd7e2bf088f3bc2
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1392739780 -0800
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1392739780 -0800

Merge 3.14-rc3 into char-misc-next

We need the fixes here for future mei and other patches.

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