| commit | ff2bb047c4bce9742e94911eeb44b4d6ff4734ab | [log] [tgz] |
|---|---|---|
| author | James Morris <james.l.morris@oracle.com> | Tue May 22 11:21:06 2012 +1000 |
| committer | James Morris <james.l.morris@oracle.com> | Tue May 22 11:21:06 2012 +1000 |
| tree | 9d9b1cfa3fc17f0cc13f34ca697306cb1f46b05f | |
| parent | cffee16e8b997ab947de661e8820e486b0830c94 [diff] | |
| parent | c737f8284cac91428f8fcc8281e69117fa16e887 [diff] |
Merge branch 'master' of git://git.infradead.org/users/eparis/selinux into next Per pull request, for 3.5.