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

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

parents ac60ab4b 21c7eae2
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