summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJussi Kivilinna2013-03-07 21:33:38 +0100
committerJohn W. Linville2013-03-08 21:58:54 +0100
commite6146c5cefedefe69676ab6b2c28a40c2d749ec2 (patch)
tree8c5c6bb17cca15c311d5da6e16c8871a2dc7560b
parentMerge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlw... (diff)
downloadkernel-qcow2-linux-e6146c5cefedefe69676ab6b2c28a40c2d749ec2.tar.gz
kernel-qcow2-linux-e6146c5cefedefe69676ab6b2c28a40c2d749ec2.tar.xz
kernel-qcow2-linux-e6146c5cefedefe69676ab6b2c28a40c2d749ec2.zip
rndis_wlan: update email address
Signed-off-by: Jussi Kivilinna <jussi.kivilinna@iki.fi> Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r--MAINTAINERS2
-rw-r--r--drivers/net/wireless/rndis_wlan.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index e95b1e944eb7..7f68b5e0ce6b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -8504,7 +8504,7 @@ F: drivers/usb/gadget/*uvc*.c
F: drivers/usb/gadget/webcam.c
USB WIRELESS RNDIS DRIVER (rndis_wlan)
-M: Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
+M: Jussi Kivilinna <jussi.kivilinna@iki.fi>
L: linux-wireless@vger.kernel.org
S: Maintained
F: drivers/net/wireless/rndis_wlan.c
diff --git a/drivers/net/wireless/rndis_wlan.c b/drivers/net/wireless/rndis_wlan.c
index 5f66b4eac298..8169a85c4498 100644
--- a/drivers/net/wireless/rndis_wlan.c
+++ b/drivers/net/wireless/rndis_wlan.c
@@ -2,7 +2,7 @@
* Driver for RNDIS based wireless USB devices.
*
* Copyright (C) 2007 by Bjorge Dijkstra <bjd@jooz.net>
- * Copyright (C) 2008-2009 by Jussi Kivilinna <jussi.kivilinna@mbnet.fi>
+ * Copyright (C) 2008-2009 by Jussi Kivilinna <jussi.kivilinna@iki.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by