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