From 63cc816125d216da2d1d07ef78b4871c62bc4b04 Mon Sep 17 00:00:00 2001 From: Inaky Perez-Gonzalez Date: Sat, 20 Dec 2008 16:58:00 -0800 Subject: [PATCH] --- yaml --- r: 127327 b: refs/heads/master c: 8a70da82edc50aa7a4b54864babf2d72538ba1bb h: refs/heads/master i: 127325: d53abac1a0d08cb401ec31c0d51c155b2d82ae66 127323: 4fe49e3f526c34b25b0237c86bce6f51c8615423 127319: 3bcaffd4e4dfae2cced35316987dcc6e0773d0b4 127311: c654c9d0aaa42d5ba95f8243d960a7c199ca798b 127295: a8b16c745c28b132459895ca126e5be4b5b10e1e v: v3 --- [refs] | 2 +- trunk/CREDITS | 17 +++++++++++++++++ trunk/MAINTAINERS | 16 ++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 6273083b6932..42e101d0f491 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e30698743419d20dce03d033761f203b4d847ab0 +refs/heads/master: 8a70da82edc50aa7a4b54864babf2d72538ba1bb diff --git a/trunk/CREDITS b/trunk/CREDITS index abe05a0be4ed..9f1736a8d5a2 100644 --- a/trunk/CREDITS +++ b/trunk/CREDITS @@ -464,6 +464,11 @@ S: 1200 Goldenrod Dr. S: Nampa, Idaho 83686 S: USA +N: Dirk J. Brandewie +E: dirk.j.brandewie@intel.com +E: linux-wimax@intel.com +D: Intel Wireless WiMAX Connection 2400 SDIO driver + N: Derrick J. Brashear E: shadow@dementia.org W: http://www.dementia.org/~shadow @@ -2119,6 +2124,11 @@ N: H.J. Lu E: hjl@gnu.ai.mit.edu D: GCC + libraries hacker +N: Yanir Lubetkin +E: yanirx.lubatkin@intel.com +E: linux-wimax@intel.com +D: Intel Wireless WiMAX Connection 2400 driver + N: Michal Ludvig E: michal@logix.cz E: michal.ludvig@asterisk.co.nz @@ -2693,6 +2703,13 @@ S: RR #5, 497 Pole Line Road S: Thunder Bay, Ontario S: CANADA P7C 5M9 +N: Inaky Perez-Gonzalez +E: inaky.perez-gonzalez@intel.com +E: linux-wimax@intel.com +E: inakypg@yahoo.com +D: WiMAX stack +D: Intel Wireless WiMAX Connection 2400 driver + N: Yuri Per E: yuri@pts.mipt.ru D: Some smbfs fixes diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index f62fd6ac45af..2b03fb5f06aa 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2305,6 +2305,14 @@ W: http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel W: http://ipw2200.sourceforge.net S: Supported +INTEL WIRELESS WIMAX CONNECTION 2400 +P: Inaky Perez-Gonzalez +M: inaky.perez-gonzalez@intel.com +M: linux-wimax@intel.com +L: wimax@linuxwimax.org +S: Supported +W: http://linuxwimax.org + INTEL WIRELESS WIFI LINK (iwlwifi) P: Zhu Yi M: yi.zhu@intel.com @@ -4733,6 +4741,14 @@ M: zaga@fly.cc.fer.hr L: linux-scsi@vger.kernel.org S: Maintained +WIMAX STACK +P: Inaky Perez-Gonzalez +M: inaky.perez-gonzalez@intel.com +M: linux-wimax@intel.com +L: wimax@linuxwimax.org +S: Supported +W: http://linuxwimax.org + WIMEDIA LLC PROTOCOL (WLP) SUBSYSTEM P: David Vrabel M: david.vrabel@csr.com