From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 20 Jul 2011 04:50:21 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: Ubuntu-5.0.0-8.9~18261
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=e501f29c727dea74e2124c584cbab5fa805d489b;p=mirror_ubuntu-disco-kernel.git

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

e501f29c727dea74e2124c584cbab5fa805d489b