diff options
author | John W. Linville <linville@tuxdriver.com> | 2013-08-29 14:08:24 -0400 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2013-08-29 14:08:24 -0400 |
commit | 0d8165e9fca119b804de2cf35674e07c36c9704f (patch) | |
tree | 3d66d027b502b6fdb98666a9121c7f52b48c657d /MAINTAINERS | |
parent | 4c9d546f6c522f541dfb01e192ab7101eca0053b (diff) | |
parent | 076f0d20b636ef0e701e21e701c0631b5757b732 (diff) | |
download | linux-0d8165e9fca119b804de2cf35674e07c36c9704f.tar.gz linux-0d8165e9fca119b804de2cf35674e07c36c9704f.tar.bz2 linux-0d8165e9fca119b804de2cf35674e07c36c9704f.zip |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/pcie/trans.c
Diffstat (limited to 'MAINTAINERS')
-rw-r--r-- | MAINTAINERS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index b2887c5424d1..705bb96bc37e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5792,7 +5792,7 @@ M: Aloisio Almeida Jr <aloisio.almeida@openbossa.org> M: Samuel Ortiz <sameo@linux.intel.com> L: linux-wireless@vger.kernel.org L: linux-nfc@lists.01.org (moderated for non-subscribers) -S: Maintained +S: Supported F: net/nfc/ F: include/net/nfc/ F: include/uapi/linux/nfc.h |