tree e41dd99f2c217a8ce160b24d81a4aec1cccbfe02
parent e0b057b406a33501a656dc8d67ea945d7bcdad61
parent 0e94ae17c857b3835a2b8ea46ce44b5da4e2cc5d
author James Morris <jmorris@namei.org> 1319315038 +0200
committer James Morris <jmorris@namei.org> 1319315038 +0200

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