From: Linus Torvalds <torvalds@linux-foundation.org>
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.karo-electronics.de/?a=commitdiff_plain;h=938a73b959cf77aadc41bded3bf416b618aa20b3;p=linux-beck.git

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

938a73b959cf77aadc41bded3bf416b618aa20b3