summaryrefslogtreecommitdiffstats
path: root/drivers/char
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-02-06 01:12:38 +0100
committerLinus Torvalds <torvalds@linux-foundation.org>2009-02-06 01:12:38 +0100
commit082256333f4e879bc4b56e294921aaff6d035da0 (patch)
treeddc5ea679909d19b1c7279907c6ff762bc8ac598 /drivers/char
parentMerge branch 'sh/for-2.6.29' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff)
parentRevert "configfs: Silence lockdep on mkdir(), rmdir() and configfs_depend_ite... (diff)
downloadlinux-082256333f4e879bc4b56e294921aaff6d035da0.tar.xz
linux-082256333f4e879bc4b56e294921aaff6d035da0.zip
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()"
Diffstat (limited to 'drivers/char')
0 files changed, 0 insertions, 0 deletions