leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
9f0d34bc34
linux/drivers/net/wireless/rtlwifi
History
David S. Miller 9f0d34bc34 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/usb/asix_common.c
	drivers/net/usb/sr9800.c
	drivers/net/usb/usbnet.c
	include/linux/usb/usbnet.h
	net/ipv4/tcp_ipv4.c
	net/ipv6/tcp_ipv6.c

The TCP conflicts were overlapping changes.  In 'net' we added a
READ_ONCE() to the socket cached RX route read, whilst in 'net-next'
Eric Dumazet touched the surrounding code dealing with how mini
sockets are handled.

With USB, it's a case of the same bug fix first going into net-next
and then I cherry picked it back into net.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-04-02 16:16:53 -04:00
..
btcoexist rtlwifi: btcoexist: Fix Smatch warning 2014-09-26 17:22:27 -04:00
rtl8188ee rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8192c rtlwifi: rtl8192c-common: Convert driver to use common DM table initialization 2015-01-09 15:48:12 +02:00
rtl8192ce rtlwifi: Remove unused RF6052_MAX_REG define 2015-03-03 15:30:03 +02:00
rtl8192cu rtlwifi: rtl8192cu: Add new device ID 2015-03-30 11:38:25 +03:00
rtl8192de rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8192ee rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8192se rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8723ae rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8723be rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
rtl8723com rtlwifi: rtl8723be: Update driver to match Realtek release of 06/28/14 2014-09-30 13:17:15 -04:00
rtl8821ae rtlwifi: Change REG_CR+2 to MSR 2015-03-30 11:30:07 +03:00
base.c rtlwifi: Improve handling of IPv6 packets 2015-03-03 17:07:05 +02:00
base.h rtlwifi: Remove duplicated prototype 2015-03-13 15:13:39 +02:00
cam.c rtlwifi: Modify cam.{c,h} and efuse.{c,h} for new drivers 2014-09-26 17:22:28 -04:00
cam.h rtlwifi: Remove unused defines from cam.h 2015-03-03 15:30:05 +02:00
core.c wireless: Use eth_<foo>_addr instead of memset 2015-03-03 17:01:36 -05:00
core.h rtlwifi: Remove unused RTL_SUPPORTED_CTRL_FILTER define 2015-03-03 15:30:09 +02:00
debug.c rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
debug.h rtlwifi: rtl8821ae: Move driver from staging to regular tree 2014-09-26 17:22:28 -04:00
efuse.c rtlwifi: rtl8188ee: rtl8723ae: rtl8821ae: Initialize some variables 2014-09-30 13:17:38 -04:00
efuse.h rtlwifi: Remove unused defines from efuse.h 2015-03-03 15:30:08 +02:00
Kconfig rtlwifi: Fix Kconfig for RTL8192EE 2014-10-02 14:26:32 -04:00
Makefile rtlwifi: rtl8192ee: Move driver from staging to the regular tree 2014-09-30 13:17:14 -04:00
pci.c rtlwifi: Fix IOMMU mapping leak in AP mode 2015-03-22 07:52:25 +02:00
pci.h rtlwifi: rtl8192ee: Fix problems with calculating free space in FIFO 2015-02-06 08:36:08 +02:00
ps.c rtlwifi: Update power-save routines for 062814 driver 2014-09-26 17:22:28 -04:00
ps.h rtlwifi: Update power-save routines for 062814 driver 2014-09-26 17:22:28 -04:00
pwrseqcmd.h rtlwifi: rtl8821ae: Move driver from staging to regular tree 2014-09-26 17:22:28 -04:00
rc.c rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
rc.h rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
regd.c rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
regd.h rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
stats.c rtlwifi: No need to export rtl_evm_dbm_jaguar anymore 2015-03-16 17:55:41 +02:00
stats.h rtlwifi: No need to export rtl_evm_dbm_jaguar anymore 2015-03-16 17:55:41 +02:00
usb.c rtlwifi: Modify some USB de-initialize code. 2015-02-27 10:05:26 +02:00
usb.h
wifi.h rtlwifi: rtl8192ee: Fix handling of new style descriptors 2015-02-06 08:36:00 +02:00