summaryrefslogtreecommitdiffstats
path: root/fs/gfs2
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 12:56:48 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-07 12:56:48 -0700
commit938a73b959cf77aadc41bded3bf416b618aa20b3 (patch)
tree812bdbf0d1dc219d55eaf0e66935a523669ca6c6 /fs/gfs2
parent45480aa75b03d6705ab5ceebda9d09be22f4e928 (diff)
parentf70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40 (diff)
downloadlinux-938a73b959cf77aadc41bded3bf416b618aa20b3.tar.bz2
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm: fs/dlm: Drop unnecessary null test dlm: use genl_register_family_with_ops()
Diffstat (limited to 'fs/gfs2')
0 files changed, 0 insertions, 0 deletions