diff options
| author | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2011-01-28 16:23:14 -0500 |
| commit | 3e11210d46a4f252f41db6e442b46026aeddbb59 (patch) | |
| tree | b258375de649a5e04e8d567c850b47c41f8ceb11 /MAINTAINERS | |
| parent | 3bf63e59e577cbecd41334c866f501c4cc5d54c5 (diff) | |
| parent | c7c1806098752c1f46943d8db2c69aff07f5d4bc (diff) | |
| download | kernel_samsung_tuna-3e11210d46a4f252f41db6e442b46026aeddbb59.zip kernel_samsung_tuna-3e11210d46a4f252f41db6e442b46026aeddbb59.tar.gz kernel_samsung_tuna-3e11210d46a4f252f41db6e442b46026aeddbb59.tar.bz2 | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-2.6
Conflicts:
drivers/net/wireless/ath/ath9k/init.c
Diffstat (limited to 'MAINTAINERS')
| -rw-r--r-- | MAINTAINERS | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 4a953a5..cf44acd 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -3323,7 +3323,6 @@ F: drivers/net/wimax/i2400m/ F: include/linux/wimax/i2400m.h INTEL WIRELESS WIFI LINK (iwlwifi) -M: Reinette Chatre <reinette.chatre@intel.com> M: Wey-Yi Guy <wey-yi.w.guy@intel.com> M: Intel Linux Wireless <ilw@linux.intel.com> L: linux-wireless@vger.kernel.org |