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

Merge branch 'master' of git://gitorious.org/smack-next/kernel into next

parents e0b057b4 0e94ae17
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