diff options
| author | David S. Miller <davem@davemloft.net> | 2009-08-28 23:06:05 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-28 23:06:05 -0700 |
| commit | b7f1d43a2ba1b63abbb1dcd966ab1edb9f62f636 (patch) | |
| tree | 9507b9d129ea8d7598d79f4b5674865483c7f00b /MAINTAINERS | |
| parent | 6c9888532bb540cb692f51f1d34fe9344eed5a0d (diff) | |
| parent | ad43f8bfb7b9a6a8b800cdad24c4a62180a5eb3d (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index baa0aa812be..0ab47e7fc2e 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2653,25 +2653,21 @@ F: drivers/net/ixgbe/ INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT M: Zhu Yi <yi.zhu@intel.com> -M: James Ketrenos <jketreno@linux.intel.com> M: Reinette Chatre <reinette.chatre@intel.com> +M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org -L: ipw2100-devel@lists.sourceforge.net -W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel W: http://ipw2100.sourceforge.net -S: Supported +S: Odd Fixes F: Documentation/networking/README.ipw2100 F: drivers/net/wireless/ipw2x00/ipw2100.* INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT M: Zhu Yi <yi.zhu@intel.com> -M: James Ketrenos <jketreno@linux.intel.com> M: Reinette Chatre <reinette.chatre@intel.com> +M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org -L: ipw2100-devel@lists.sourceforge.net -W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel W: http://ipw2200.sourceforge.net -S: Supported +S: Odd Fixes F: Documentation/networking/README.ipw2200 F: drivers/net/wireless/ipw2x00/ipw2200.* @@ -2688,8 +2684,8 @@ F: include/linux/wimax/i2400m.h INTEL WIRELESS WIFI LINK (iwlwifi) M: Zhu Yi <yi.zhu@intel.com> M: Reinette Chatre <reinette.chatre@intel.com> +M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org -L: ipw3945-devel@lists.sourceforge.net W: http://intellinuxwireless.org T: git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git S: Supported |