From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 24 Jun 2009 21:17:14 +0000 (-0700)
Subject: Merge branches 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro... 
X-Git-Tag: v2.6.31-rc1~3
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=c6223048259006759237d826219f0fa4f312fb47;p=linux.git

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
---

c6223048259006759237d826219f0fa4f312fb47