From: Linus Torvalds Date: Sat, 7 Aug 2010 19:56:48 +0000 (-0700) Subject: Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=938a73b959cf77aadc41bded3bf416b618aa20b3;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branch 'for-linus' of git://git./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() --- 938a73b959cf77aadc41bded3bf416b618aa20b3