David S. Miller c3fa32b976 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net ...

Conflicts:
	drivers/net/usb/qmi_wwan.c
	include/net/dst.h

Trivial merge conflicts, both were overlapping changes.

Signed-off-by: David S. Miller <davem@davemloft.net>

2013-10-23 16:49:34 -04:00

..

rtl8188ee

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2013-10-07 15:40:44 -04:00

rtl8192c

rtlwifi: rtl8192c: Remove rtl8192c_phy_scan_operation_backup()

2013-10-03 16:36:51 -04:00

rtl8192ce

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2013-10-07 15:40:44 -04:00

rtl8192cu

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

2013-10-23 16:49:34 -04:00

rtl8192de

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2013-10-07 15:40:44 -04:00

rtl8192se

rtlwifi: Remove all remaining references to variable 'noise' in rtl_stats struct

2013-10-03 16:24:29 -04:00

rtl8723ae

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2013-10-07 15:40:44 -04:00

base.c

rtlwifi: Implement a common rtl_phy_scan_operation_backup() routine

2013-10-03 16:24:30 -04:00

base.h

rtlwifi: Implement a common rtl_phy_scan_operation_backup() routine

2013-10-03 16:24:30 -04:00

cam.c

rtlwifi: use eth_zero_addr() to assign zero address

2012-11-16 14:29:07 -05:00

cam.h

rtlwifi: Remove extern from function prototypes

2013-09-24 18:06:51 -07:00

core.c

net:drivers/net: Miscellaneous conversions to ETH_ALEN

2013-10-02 17:04:45 -04:00

core.h

rtlwifi: Convert to asynchronous firmware load

2012-01-30 15:48:50 -05:00

debug.c

rtlwifi: Fix build errors for unusual cases

2013-07-18 16:22:00 -04:00

debug.h

rtlwifi: rtl8192c: rtl8192ce: rtl8192cu: rtl8192de: rtl8723ae: Add changes required by adding rtl81988ee

2013-04-01 16:20:53 -04:00

efuse.c

wireless: rtlwifi: Replace variable with a break

2013-09-26 15:15:15 -04:00

efuse.h

rtlwifi: Remove extern from function prototypes

2013-09-24 18:06:51 -07:00

Kconfig

rtlwifi: Fix build errors for unusual cases

2013-07-18 16:22:00 -04:00

Makefile

rtlwifi: Fix build errors for unusual cases

2013-07-18 16:22:00 -04:00

pci.c

rtlwifi: Fix smatch warning in pci.c

2013-10-03 16:24:28 -04:00

pci.h

rtlwifi: rtl8188ee: Enable recognition of RTL8188EE

2013-04-01 16:20:54 -04:00

ps.c

drivers/net: Convert uses of compare_ether_addr to ether_addr_equal

2013-09-03 22:28:04 -04:00

ps.h

rtlwifi: Initialize power-setting callback for USB devices

2013-07-17 14:34:48 -04:00

rc.c

mac80211/rc80211: add chandef to rate initialization

2013-07-16 09:58:02 +03:00

rc.h

rtlwifi: Update copyright dates

2012-01-24 14:08:37 -05:00

regd.c

wireless: make the reg_notifier() void

2013-01-14 11:32:44 +01:00

regd.h

wireless: make the reg_notifier() void

2013-01-14 11:32:44 +01:00

stats.c

rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver

2012-11-14 14:55:31 -05:00

stats.h

rtlwifi: Modify files for addition of rtl8723ae

2012-11-14 14:55:30 -05:00

usb.c

rtlwifi: Fix smatch warnings in usb.c

2013-10-03 16:24:29 -04:00

usb.h

rtlwifi: usb: defer rx processing to tasklet

2013-03-25 16:42:22 -04:00

wifi.h

Merge git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next

2013-10-07 15:40:44 -04:00