John W. Linville
a70171dce9
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next-2.6 into for-davem
...
Conflicts:
drivers/net/wireless/libertas/if_cs.c
drivers/net/wireless/rtlwifi/pci.c
net/bluetooth/l2cap_sock.c
2011-05-05 13:32:35 -04:00
Chaoming_Li
81b2904511
rtlwifi: Convert regulatory domain routines for addition of rtl8192se and rtl8192de
...
Convert regulatory domain routines for addition of RTL8192SE and
RTL8192DE code.
Signed-off-by: Chaoming_Li <chaoming_li@realsil.com.cn>
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2011-04-26 16:13:32 -04:00
Lucas De Marchi
25985edced
Fix common misspellings
...
Fixes generated by 'codespell' and manually reviewed.
Signed-off-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
2011-03-31 11:26:23 -03:00
Larry Finger
0c8173385e
rtl8192ce: Add new driver
...
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2010-12-15 16:17:49 -05:00
