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)
commitda1b001a2a2a9cb323e58327ed07ac4a5e6d96ea
treeb4d183c6a4bab6a2b53d9ac9f4501bcd46cb158b
parentdf8d6fe9efba4ea4b46a5bdc229031c5bb880575
parent1836750115f20b774e55c032a3893e8c5bdf41ed
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()