Skip to content
Commit 58e868be authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge 3.14-rc4 into char-misc-linus 



Merge this to catch up with the other patches sent upstream.

Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parents d91f9ecf cfbf8d48
Hide whitespace changes
Inline Side-by-side
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