diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-11-28 10:56:03 -0500 |
| commit | 79d38f7d6cf545ff838dd5227869f3916d1d100d (patch) | |
| tree | 859c8071aab68fd32f36ffb9ebc04cf12db6e5e0 /MAINTAINERS | |
| parent | 03f52a0a554210d5049eeed9f1bb29047dc807cb (diff) | |
| parent | 0751f8654602e4255f0b9c17784d8100d5896010 (diff) | |
| download | linux-3.10-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.gz linux-3.10-79d38f7d6cf545ff838dd5227869f3916d1d100d.tar.bz2 linux-3.10-79d38f7d6cf545ff838dd5227869f3916d1d100d.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/tx.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 9087e0d6f1a..5d72dd57b78 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -5157,6 +5157,7 @@ F: net/nfc/ F: include/linux/nfc.h F: include/net/nfc/ F: drivers/nfc/ +F: include/linux/platform_data/pn544.h NFS, SUNRPC, AND LOCKD CLIENTS M: Trond Myklebust <Trond.Myklebust@netapp.com> |