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

This commit is contained in:
James Morris 2015-01-29 11:01:07 +11:00
commit 90200f1916