diff options
| author | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2012-07-12 13:44:50 -0400 |
| commit | 38a00840638b4932152bca48098dbfa069d942a2 (patch) | |
| tree | dd12897854f6df8aac237d5fd46551c74be8153a /MAINTAINERS | |
| parent | 391e5c22f5f4e55817f8ba18a08ea717ed2d4a1f (diff) | |
| parent | 2f8684ce7a47c91da7e0ccba2686277c103d02b6 (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 | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index ce7398e1e1ec..b4321fb74698 100644 --- a/MAINTAINERS +++ b/MAINTAINERS | |||
| @@ -3661,14 +3661,6 @@ T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git | |||
| 3661 | S: Supported | 3661 | S: Supported |
| 3662 | F: drivers/net/wireless/iwlwifi/ | 3662 | F: drivers/net/wireless/iwlwifi/ |
| 3663 | 3663 | ||
| 3664 | INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi) | ||
| 3665 | M: Samuel Ortiz <samuel.ortiz@intel.com> | ||
| 3666 | M: Intel Linux Wireless <ilw@linux.intel.com> | ||
| 3667 | L: linux-wireless@vger.kernel.org | ||
| 3668 | S: Supported | ||
| 3669 | W: http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi | ||
| 3670 | F: drivers/net/wireless/iwmc3200wifi/ | ||
| 3671 | |||
| 3672 | INTEL MANAGEMENT ENGINE (mei) | 3664 | INTEL MANAGEMENT ENGINE (mei) |
| 3673 | M: Tomas Winkler <tomas.winkler@intel.com> | 3665 | M: Tomas Winkler <tomas.winkler@intel.com> |
| 3674 | L: linux-kernel@vger.kernel.org | 3666 | L: linux-kernel@vger.kernel.org |