| commit | 938a73b959cf77aadc41bded3bf416b618aa20b3 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 07 12:56:48 2010 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Aug 07 12:56:48 2010 -0700 |
| tree | 812bdbf0d1dc219d55eaf0e66935a523669ca6c6 | |
| parent | 45480aa75b03d6705ab5ceebda9d09be22f4e928 [diff] | |
| parent | f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40 [diff] |
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()