Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 7da59d2f authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge v3.6-rc3 into 'char-misc-next' 



This resolves a conflict in:
	drivers/misc/mei/interrupt.c

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