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

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

parents f8eb8a13 10289b0f
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