Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Dec 2011 16:14:42 +0000 (08:14 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 7 Dec 2011 16:14:42 +0000 (08:14 -0800)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs:
  fix apparmor dereferencing potentially freed dentry, sanitize __d_path() API


Trivial merge