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

Requested by Casey.