Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 04:50:21 +0000 (21:50 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 20 Jul 2011 04:50:21 +0000 (21:50 -0700)
commitc897301bc8c8ae7ddd988d3df2fc1d9a13667f11
tree3a5c3611e7fc3ac454fd498b93a521d7a1e2be05
parentb5aee7a7c544f61f960f967df49e411031cb36e7
parent7b7ab2f7532e4bf277d2e5a7409378e389e7ab22
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  vfs: fix race in rcu lookup of pruned dentry
  Fix cifs_get_root()

[ Edited the last commit to get rid of a 'unused variable "seq"'
  warning due to Al editing the patch.  - Linus ]