bede2f26e51d8c786bc
parent 84a1caf1453c3d44050bd22db958af4a7f99315c
author Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1342617765 -0700
committer Greg Kroah-Hartman <gregkh@linuxfoundation.org> 1342617765 -0700

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>
�;�ٕ6x