diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:16 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-09-30 14:52:29 -0400 |
| commit | 8e00f5fbb4ecbc3431fa686cba60cd76a62604af (patch) | |
| tree | 78aa3bdef892dbd1afc8969fc528e529cfc266f7 /MAINTAINERS | |
| parent | 56fd49e399ce1d82200fad5b8924d4e35a587809 (diff) | |
| parent | 0874073570d9184a169a4ae2abbe8dbcb71878e9 (diff) | |
Merge branch 'master' of git://git.infradead.org/users/linville/wireless-next into for-davem
Conflicts:
drivers/net/wireless/iwlwifi/iwl-pci.c
drivers/net/wireless/wl12xx/main.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 5faf685ee6c2..65ca7eae6276 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3426,7 +3426,7 @@ M: Wey-Yi Guy <wey-yi.w.guy@intel.com> | |||
| 3426 | M: Intel Linux Wireless <ilw@linux.intel.com> | 3426 | M: Intel Linux Wireless <ilw@linux.intel.com> |
| 3427 | L: linux-wireless@vger.kernel.org | 3427 | L: linux-wireless@vger.kernel.org |
| 3428 | W: http://intellinuxwireless.org | 3428 | W: http://intellinuxwireless.org |
| 3429 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git | 3429 | T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git |
| 3430 | S: Supported | 3430 | S: Supported |
| 3431 | F: drivers/net/wireless/iwlwifi/ | 3431 | F: drivers/net/wireless/iwlwifi/ |
| 3432 | 3432 | ||
| @@ -4528,7 +4528,7 @@ L: linux-wireless@vger.kernel.org | |||
| 4528 | S: Maintained | 4528 | S: Maintained |
| 4529 | F: net/nfc/ | 4529 | F: net/nfc/ |
| 4530 | F: include/linux/nfc.h | 4530 | F: include/linux/nfc.h |
| 4531 | F: include/net/nfc.h | 4531 | F: include/net/nfc/ |
| 4532 | F: drivers/nfc/ | 4532 | F: drivers/nfc/ |
| 4533 | 4533 | ||
| 4534 | NFS, SUNRPC, AND LOCKD CLIENTS | 4534 | NFS, SUNRPC, AND LOCKD CLIENTS |