diff options
| author | James Morris | 2011-06-30 18:44:55 +1000 |
|---|---|---|
| committer | James Morris | 2011-06-30 18:44:55 +1000 |
| commit | da3f1c7b7d34e66cf571a613525ca0d23f92d42f (patch) | |
| tree | 0233826259cbe4cd44755ccc893b77a3e8ac5213 /lib | |
| parent | 5b944a71a192977c1c018bbcfa0c52dca48e2368 (diff) | |
| parent | 25e75dff519bcce2cb35023105e7df51d7b9e691 (diff) | |
Merge branch 'for-security' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/apparmor-dev into next
Diffstat (limited to 'lib')
0 files changed, 0 insertions, 0 deletions