tree 8118ba6e7d052527a14970b081934a2935283174
parent 6aaf05f472c97ebceff47d9eef464574f1a55727
parent 40809565ca57a8e94bae20b22da014c44ec233f6
author James Morris <jmorris@namei.org> 1321575426 +1100
committer James Morris <jmorris@namei.org> 1321575426 +1100

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