Skip to content
Commit 5b1f6d81 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents 8397c76a 84a1caf1
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment