summaryrefslogtreecommitdiffstats
path: root/security/apparmor
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 21:46:36 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2012-01-10 21:46:36 -0800
commit5cd9599bba428762025db6027764f1c59d0b1e1b (patch)
treecb59ea13f6e6de4350ca38338bf9633e89f8418a /security/apparmor
parente343a895a9f342f239c5e3c5ffc6c0b1707e6244 (diff)
parentd668dc56631da067540b2494d2a1f29ff7b5f15a (diff)
downloadblackbird-op-linux-5cd9599bba428762025db6027764f1c59d0b1e1b.tar.gz
blackbird-op-linux-5cd9599bba428762025db6027764f1c59d0b1e1b.zip
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs: autofs4: deal with autofs4_write/autofs4_write races autofs4: catatonic_mode vs. notify_daemon race autofs4: autofs4_wait() vs. autofs4_catatonic_mode() race hfsplus: creation of hidden dir on mount can fail block_dev: Suppress bdev_cache_init() kmemleak warninig fix shrink_dcache_parent() livelock coda: switch coda_cnode_make() to sane API as well, clean coda_lookup() coda: deal correctly with allocation failure from coda_cnode_makectl() securityfs: fix object creation races
Diffstat (limited to 'security/apparmor')
0 files changed, 0 insertions, 0 deletions
OpenPOWER on IntegriCloud