Skip to content
Commit 9d5a5f65 authored by James Morris's avatar James Morris
Browse files

Merge branch 'smack-for-3.20-rebased' of git://git.gitorious.org/smack-next/kernel into next

parents 743410a0 6d1cff2a
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