diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 01:02:12 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-11 01:02:12 +0100 |
| commit | 8322b6fddfd2cee41a7732284e5f04750511f4b2 (patch) | |
| tree | ebff5f6c0d43aa82c7e36cfb5cfd40be050db8a2 /security/smack/smack_lsm.c | |
| parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
| parent | dlm: adopt orphan locks (diff) | |
| download | linux-8322b6fddfd2cee41a7732284e5f04750511f4b2.tar.xz linux-8322b6fddfd2cee41a7732284e5f04750511f4b2.zip | |
Merge tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm
Pull dlm update from David Teigland:
"This set includes one feature, which allows locks that have been
orphaned to be reacquired"
* tag 'dlm-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm:
dlm: adopt orphan locks
Diffstat (limited to 'security/smack/smack_lsm.c')
0 files changed, 0 insertions, 0 deletions