summaryrefslogtreecommitdiff
path: root/drivers/net/wireless/rtlwifi/base.c
diff options
context:
space:
mode:
authorJohn W. Linville <linville@tuxdriver.com>2012-03-05 15:05:54 -0500
committerJohn W. Linville <linville@tuxdriver.com>2012-03-05 15:05:54 -0500
commit051d3b50430160a86cbe4a2deef219c8038bd03f (patch)
treeb2c276067819f259f86369e5341202332a8172be /drivers/net/wireless/rtlwifi/base.c
parentffcb97388b1d41b1db063eb041cb9af408662127 (diff)
parentc288ec614e264b46853c65d3db9ccf91d53c9484 (diff)
downloadolio-linux-3.10-051d3b50430160a86cbe4a2deef219c8038bd03f.tar.xz
olio-linux-3.10-051d3b50430160a86cbe4a2deef219c8038bd03f.zip
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem
Diffstat (limited to 'drivers/net/wireless/rtlwifi/base.c')
-rw-r--r--drivers/net/wireless/rtlwifi/base.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/wireless/rtlwifi/base.c b/drivers/net/wireless/rtlwifi/base.c
index df5655cc55c..510023554e5 100644
--- a/drivers/net/wireless/rtlwifi/base.c
+++ b/drivers/net/wireless/rtlwifi/base.c
@@ -39,10 +39,10 @@
#include <linux/module.h>
/*
- *NOTICE!!!: This file will be very big, we hsould
- *keep it clear under follwing roles:
+ *NOTICE!!!: This file will be very big, we should
+ *keep it clear under following roles:
*
- *This file include follwing part, so, if you add new
+ *This file include following parts, so, if you add new
*functions into this file, please check which part it
*should includes. or check if you should add new part
*for this file: