summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-24 14:17:14 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-24 14:17:14 -0700
commitc6223048259006759237d826219f0fa4f312fb47 (patch)
treeee7d50b2d1b5e1d3347a3ec535a8ed563e41a74f /kernel
parentbd453cd487ac7116a269517779b83c1061debbec (diff)
parentd5bb68adda7cc179e8efadeaa3a283cb470f13a6 (diff)
parent3a6a6c16be78472a52f6dd7d88913373b42ad0f7 (diff)
Merge branches 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/{vfs-2.6,audit-current}
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6: another race fix in jfs_check_acl() Get "no acls for this inode" right, fix shmem breakage inline functions left without protection of ifdef (acl) * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: audit: inode watches depend on CONFIG_AUDIT not CONFIG_AUDIT_SYSCALL