Commit Graph

3 Commits

Author SHA1 Message Date
John W. Linville
655d8e2328 Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next
Conflicts:
	drivers/net/wireless/ath/carl9170/debug.c
	drivers/net/wireless/ath/carl9170/main.c
	net/mac80211/ieee80211_i.h
2013-04-10 14:09:54 -04:00
Chen, Chien-Chia
2a2ac7561a rtlwifi: rtl8188ee: Fix wrong header patch
This patch is to fix some wrong header file path.
It has caused the build failed.

Signed-off-by: Chen, Chien-Chia <machen@suse.com>
Cc: larry.finger@lwfinger.net
Cc: zhiyuan_yang@realsil.com.cn
Cc: page_he@realsil.com.cn
Cc: mmarek@suse.cz
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2013-04-03 15:07:02 -04:00
Larry Finger
f0eb856e0b rtlwifi: rtl8188ee: Add new driver
Signed-off-by: Larry Finger <Larry.Finger@lwfinger.net>
Cc: jcheung@suse.com
Cc: machen@suse.com
Cc: mmarek@suse.cz
Cc: page_he@realsil.com.cn
Signed-off-by: John W. Linville <linville@tuxdriver.com>
2013-04-01 16:20:13 -04:00