Skip to content
Commit 9c5891bd authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.11-rc3 into char-misc-next. 



This resolves a merge issue with:
	drivers/misc/mei/init.c

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents ecda040f 5ae90d8e
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment