diff options
author | John W. Linville <linville@tuxdriver.com> | 2014-03-21 19:02:04 +0100 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2014-03-21 19:02:04 +0100 |
commit | 49c0ca17ee8dd3530f688052d4eb2ae6d3e55119 (patch) | |
tree | 251a4c566723b60505234a18ed864763ad0d0506 /MAINTAINERS | |
parent | Merge branch 'bcmgenet-next' (diff) | |
parent | brcmfmac: fallback to mimo_bw_cap for older firmwares (diff) | |
download | linux-49c0ca17ee8dd3530f688052d4eb2ae6d3e55119.tar.xz linux-49c0ca17ee8dd3530f688052d4eb2ae6d3e55119.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9109eab722f5..71663f8178ea 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -6117,6 +6117,7 @@ F: include/net/nfc/ F: include/uapi/linux/nfc.h F: drivers/nfc/ F: include/linux/platform_data/pn544.h +F: Documentation/devicetree/bindings/net/nfc/ NFS, SUNRPC, AND LOCKD CLIENTS M: Trond Myklebust <trond.myklebust@primarydata.com> |