diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 12:56:48 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-07 12:56:48 -0700 |
| commit | 938a73b959cf77aadc41bded3bf416b618aa20b3 (patch) | |
| tree | 812bdbf0d1dc219d55eaf0e66935a523669ca6c6 /drivers/net/wireless/p54/p54pci.h | |
| parent | 45480aa75b03d6705ab5ceebda9d09be22f4e928 (diff) | |
| parent | f70cb33b9c270f4f1a7f28327e7d35dbf1a6fc40 (diff) | |
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 'drivers/net/wireless/p54/p54pci.h')
0 files changed, 0 insertions, 0 deletions