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