Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 16:55:39 +0000 (09:55 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 15 Jul 2011 16:55:39 +0000 (09:55 -0700)
* '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()


Trivial merge