| commit | fe8a0df46e5076429872887b467c538bc9c0c738 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Fri Nov 18 11:17:06 2011 +1100 |
| committer | James Morris <jmorris@namei.org> | Fri Nov 18 11:17:06 2011 +1100 |
| tree | 8118ba6e7d052527a14970b081934a2935283174 | |
| parent | 6aaf05f472c97ebceff47d9eef464574f1a55727 [diff] | |
| parent | 40809565ca57a8e94bae20b22da014c44ec233f6 [diff] |
Merge branch 'for-1111' of git://gitorious.org/smack-next/kernel into for-linus