diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 23:17:14 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-24 23:17:14 +0200 |
| commit | c6223048259006759237d826219f0fa4f312fb47 (patch) | |
| tree | ee7d50b2d1b5e1d3347a3ec535a8ed563e41a74f | |
| parent | Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel... (diff) | |
| parent | another race fix in jfs_check_acl() (diff) | |
| parent | audit: inode watches depend on CONFIG_AUDIT not CONFIG_AUDIT_SYSCALL (diff) | |
| download | linux-c6223048259006759237d826219f0fa4f312fb47.tar.xz linux-c6223048259006759237d826219f0fa4f312fb47.zip | |
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