Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
commit082256333f4e879bc4b56e294921aaff6d035da0
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:12:38 +0000 (5 16:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:12:38 +0000 (5 16:12 -0800)
treeddc5ea679909d19b1c7279907c6ff762bc8ac598
parent09cd5b8f9dbdc161aec404eea572fbca7d162920
parent436443f0f77f730f9f700095799c485356695c08
Merge branch 'upstream-linus' of git://git./linux/kernel/git/mfasheh/ocfs2

* 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2:
  Revert "configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_item()"