tree 812bdbf0d1dc219d55eaf0e66935a523669ca6c6
parent 45480aa75b03d6705ab5ceebda9d09be22f4e928
parent f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40
author Linus Torvalds <torvalds@linux-foundation.org> 1281211008 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> 1281211008 -0700

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()