aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/security/keys.txt
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-24 08:22:25 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-24 08:22:25 -0700
commitaf3a3ab2966112c0d0a44df7eeb1e95fe32d4495 (patch)
tree82b8d00bdbb6d88eb5ba353de8a3fe2e2ad55269 /Documentation/security/keys.txt
parentMerge tag 'hsi_fixes_for_3.4' of git://gitorious.org/kernel-hsi/kernel-hsi (diff)
parentGFS2: Instruct DLM to avoid queue convert slowdown (diff)
downloadlinux-dev-af3a3ab2966112c0d0a44df7eeb1e95fe32d4495.tar.xz
linux-dev-af3a3ab2966112c0d0a44df7eeb1e95fe32d4495.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes
Pull gfs2 fixes from Steven Whitehouse. * git://git.kernel.org/pub/scm/linux/kernel/git/steve/gfs2-3.0-fixes: GFS2: Instruct DLM to avoid queue convert slowdown
Diffstat (limited to 'Documentation/security/keys.txt')
0 files changed, 0 insertions, 0 deletions