From 23f26bf55521d6beafc41ca0fdbca828720d1f0a Mon Sep 17 00:00:00 2001
From: Samuel Ortiz <sameo@linux.intel.com>
Date: Tue, 24 Nov 2009 11:33:26 +0800
Subject: [PATCH] --- yaml --- r: 172206 b: refs/heads/master c:
 f6cd53c6a4204a3d4a274546449a70a766a99b6e h: refs/heads/master v: v3

---
 [refs]            | 2 +-
 trunk/MAINTAINERS | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 431dd0a56aaf..8d3f58d39109 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e6218cc47bd54710dc523e8c983ceddba625e3ae
+refs/heads/master: f6cd53c6a4204a3d4a274546449a70a766a99b6e
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 808e4dfb34be..5531e6fd10dd 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2788,6 +2788,15 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
 S:	Supported
 F:	drivers/net/wireless/iwlwifi/
 
+INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
+M:	Samuel Ortiz <samuel.ortiz@intel.com>
+M:	Zhu Yi <yi.zhu@intel.com>
+M:	Intel Linux Wireless <ilw@linux.intel.com>
+L:	linux-wireless@vger.kernel.org
+S:	Supported
+W:	http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
+F:	drivers/net/wireless/iwmc3200wifi/
+
 IOC3 ETHERNET DRIVER
 M:	Ralf Baechle <ralf@linux-mips.org>
 L:	linux-mips@linux-mips.org