]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit6697ec1ed09a02fd77617669170afe93e45d14d8
tree812bdbf0d1dc219d55eaf0e66935a523669ca6c6
parentcd9b0fd4b2ccbdf919141dd59963be621f8069e6
parent1276dc15874984ca3869d8209d59a428ca2e32f8
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()