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

Requested by Casey.
This commit is contained in:
James Morris 2012-09-27 11:03:40 +10:00
commit 3585e96cd1