Skip to content
Commit 5f63e885 authored by Dmitry Torokhov's avatar Dmitry Torokhov
Browse files

Merge tag 'v4.0-rc7' into next 

Sync up with Linux 4.0-rc7 to bring in ALPS changes.
parents b6d2d328 f22e6e84
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