summaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/wl12xx/wl1251_sdio.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-09-02 12:45:44 -0700
committerDavid S. Miller <davem@davemloft.net>2010-09-02 12:45:44 -0700
commit7162f6691e9d39d8d866574687cddb3f1ec65d72 (patch)
treec511679caf5c825ede4728870c513f92f4f1616b /drivers/net/wireless/wl12xx/wl1251_sdio.c
parent250e061e1d3e26600236a3dd9172e7f5f5916c00 (diff)
parent78ab952717b62c0ba6ca7f7a27eaa0486685e45f (diff)
downloadop-kernel-dev-7162f6691e9d39d8d866574687cddb3f1ec65d72.zip
op-kernel-dev-7162f6691e9d39d8d866574687cddb3f1ec65d72.tar.gz
Merge branch 'for-davem' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6
Diffstat (limited to 'drivers/net/wireless/wl12xx/wl1251_sdio.c')
-rw-r--r--drivers/net/wireless/wl12xx/wl1251_sdio.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/wireless/wl12xx/wl1251_sdio.c b/drivers/net/wireless/wl12xx/wl1251_sdio.c
index b901b61..c0b68b0 100644
--- a/drivers/net/wireless/wl12xx/wl1251_sdio.c
+++ b/drivers/net/wireless/wl12xx/wl1251_sdio.c
@@ -339,4 +339,4 @@ module_init(wl1251_sdio_init);
module_exit(wl1251_sdio_exit);
MODULE_LICENSE("GPL");
-MODULE_AUTHOR("Kalle Valo <kalle.valo@nokia.com>");
+MODULE_AUTHOR("Kalle Valo <kvalo@adurom.com>");
OpenPOWER on IntegriCloud