Merge branch 'next-smack' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...