From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 15 Jul 2011 16:55:39 +0000 (-0700)
Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
X-Git-Tag: v3.0~33
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?p=pandora-kernel.git;a=commitdiff_plain;h=da1b001a2a2a9cb323e58327ed07ac4a5e6d96ea

Merge branch 'for-linus' of git://git./linux/kernel/git/viro/vfs-2.6

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6:
  fix loop checks in d_materialise_unique()
  Fix ->d_lock locking order in unlazy_walk()
---

da1b001a2a2a9cb323e58327ed07ac4a5e6d96ea