diff options
| author | James Morris <jmorris@namei.org> | 2009-07-13 16:30:40 +0200 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2009-07-13 16:30:40 +0200 |
| commit | 7d45ecafb6792ca68da9517969d37d910601845f (patch) | |
| tree | a98b1074e5577e66a97963745f975404d0aac266 /fs/locks.c | |
| parent | Revert "SELinux: Convert avc_audit to use lsm_audit.h" (diff) | |
| parent | Merge branch 'kmemleak' of git://linux-arm.org/linux-2.6 (diff) | |
| download | linux-7d45ecafb6792ca68da9517969d37d910601845f.tar.xz linux-7d45ecafb6792ca68da9517969d37d910601845f.zip | |
Merge branch 'master' into next
Conflicts:
include/linux/personality.h
Use Linus' version.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'fs/locks.c')
0 files changed, 0 insertions, 0 deletions