| commit | fe27d4b012273640e033be80f143bdc54daa8e16 | [log] [tgz] |
|---|---|---|
| author | James Morris <jmorris@namei.org> | Fri Dec 03 08:21:01 2010 +1100 |
| committer | James Morris <jmorris@namei.org> | Fri Dec 03 08:21:01 2010 +1100 |
| tree | 4e58d69bf300ef2885644ec7f3950dc3fa87be3a | |
| parent | ad9c2b048b605fbc8d50526e330b88abdd631ab2 [diff] | |
| parent | 676dac4b1bee0469d6932f698aeb77e8489f5861 [diff] |
Merge branch 'smack-next-master' into next