From: Linus Torvalds Date: Fri, 6 Feb 2009 00:12:38 +0000 (-0800) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mfashe... X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=082256333f4e879bc4b56e294921aaff6d035da0;p=linux-2.6-omap-h63xx.git Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/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()" --- 082256333f4e879bc4b56e294921aaff6d035da0