Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe...
authorLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:12:38 +0000 (16:12 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Fri, 6 Feb 2009 00:12:38 +0000 (16:12 -0800)
* '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()"


Trivial merge