From: Linus Torvalds Date: Sat, 13 Jun 2009 01:21:19 +0000 (-0700) Subject: Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec... X-Git-Tag: v2.6.31-rc1~353 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f3ad116588151b3371ae4e092290e4f48e62b8bb;p=profile%2Fivi%2Fkernel-x86-ivi.git Merge branch 'upstream-linus' of git://git./linux/kernel/git/jlbec/configfs * 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/configfs: configfs: Rework configfs_depend_item() locking and make lockdep happy configfs: Silence lockdep on mkdir() and rmdir() --- f3ad116588151b3371ae4e092290e4f48e62b8bb