summaryrefslogtreecommitdiff
path: root/scripts/selinux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-04-11 11:04:45 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-04-11 11:04:45 -0700
commit1b6150fe82de8a555b0200d20bb5e3752fbe4160 (patch)
treed03b71e1b87b60d1a9dfbade34156e930f1be1bd /scripts/selinux
parent92ae03f2ef99fbc23bfa9080d6b58f25227bd7ef (diff)
parentca9248d8337d525c2d2b26a1d8314478d15707fb (diff)
downloadlinux-3.10-1b6150fe82de8a555b0200d20bb5e3752fbe4160.tar.gz
linux-3.10-1b6150fe82de8a555b0200d20bb5e3752fbe4160.tar.bz2
linux-3.10-1b6150fe82de8a555b0200d20bb5e3752fbe4160.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: Allow caching of rindex glock GFS2: Make sure rindex is uptodate before starting transactions GFS2: use depends instead of select in kconfig GFS2: put glock reference in error patch of read_rindex_entry
Diffstat (limited to 'scripts/selinux')
0 files changed, 0 insertions, 0 deletions