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

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

parents 6aaf05f4 40809565
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