Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 19:56:48 +0000 (12:56 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 7 Aug 2010 19:56:48 +0000 (12:56 -0700)
commit938a73b959cf77aadc41bded3bf416b618aa20b3
tree812bdbf0d1dc219d55eaf0e66935a523669ca6c6
parent45480aa75b03d6705ab5ceebda9d09be22f4e928
parentf70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40
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()