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

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

parents a6aacbde 5c1b6624
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