| commit | c45ed235abf1b0b6666417e3c394f18717976acd | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Sat Oct 22 22:23:58 2011 +0200 |
| committer | James Morris <jmorris@namei.org> | Sat Oct 22 22:23:58 2011 +0200 |
| tree | e41dd99f2c217a8ce160b24d81a4aec1cccbfe02 | |
| parent | e0b057b406a33501a656dc8d67ea945d7bcdad61 [diff] | |
| parent | 0e94ae17c857b3835a2b8ea46ce44b5da4e2cc5d [diff] |
Merge branch 'master' of git://gitorious.org/smack-next/kernel into next