diff options
| author | John W. Linville <linville@tuxdriver.com> | 2014-03-21 14:02:04 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2014-03-21 14:02:04 -0400 |
| commit | 49c0ca17ee8dd3530f688052d4eb2ae6d3e55119 (patch) | |
| tree | 251a4c566723b60505234a18ed864763ad0d0506 /MAINTAINERS | |
| parent | a85ae0e97879f51bccd8511668b07d346d98b3eb (diff) | |
| parent | 67b3bd4e65f0854aca70e0134d59b1daede49504 (diff) | |
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/ | |||
| 6117 | F: include/uapi/linux/nfc.h | 6117 | F: include/uapi/linux/nfc.h |
| 6118 | F: drivers/nfc/ | 6118 | F: drivers/nfc/ |
| 6119 | F: include/linux/platform_data/pn544.h | 6119 | F: include/linux/platform_data/pn544.h |
| 6120 | F: Documentation/devicetree/bindings/net/nfc/ | ||
| 6120 | 6121 | ||
| 6121 | NFS, SUNRPC, AND LOCKD CLIENTS | 6122 | NFS, SUNRPC, AND LOCKD CLIENTS |
| 6122 | M: Trond Myklebust <trond.myklebust@primarydata.com> | 6123 | M: Trond Myklebust <trond.myklebust@primarydata.com> |