diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 21:56:48 +0200 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 21:56:48 +0200 |
commit | 938a73b959cf77aadc41bded3bf416b618aa20b3 (patch) | |
tree | 812bdbf0d1dc219d55eaf0e66935a523669ca6c6 /fs/openpromfs/Makefile | |
parent | Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jac... (diff) | |
parent | fs/dlm: Drop unnecessary null test (diff) | |
download | linux-938a73b959cf77aadc41bded3bf416b618aa20b3.tar.xz linux-938a73b959cf77aadc41bded3bf416b618aa20b3.zip |
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()
Diffstat (limited to 'fs/openpromfs/Makefile')
0 files changed, 0 insertions, 0 deletions