alistair23-linux/drivers/net/wireless/rtlwifi
David S. Miller 3f3558bb51 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
	drivers/net/xen-netfront.c

Minor overlapping changes in xen-netfront.c, mostly to do
with some buffer management changes alongside the split
of stats into TX and RX.

Signed-off-by: David S. Miller <davem@davemloft.net>
2015-01-15 00:53:17 -05:00
..
btcoexist rtlwifi: btcoexist: Fix Smatch warning 2014-09-26 17:22:27 -04:00
rtl8188ee rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
rtl8192c rtlwifi: rtl8192ce: Add code to set the keep-alive operation 2014-12-24 18:29:32 +02:00
rtl8192ce rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
rtl8192cu rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
rtl8192de rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
rtl8192ee rtlwifi: rtl8192ee: trx.c: Remove unused function 2014-12-24 18:54:13 +02:00
rtl8192se rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
rtl8723ae rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
rtl8723be rtlwifi: rtl8723be: phy.c: Remove unused function 2014-12-24 18:58:48 +02:00
rtl8723com rtlwifi: rtl8723be: Update driver to match Realtek release of 06/28/14 2014-09-30 13:17:15 -04:00
rtl8821ae rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
base.c rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +02:00
base.h rtlwifi: rtl8821ae: Switch to use common rate control routine 2014-12-24 18:34:29 +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: Modify cam.{c,h} and efuse.{c,h} for new drivers 2014-09-26 17:22:28 -04:00
core.c rtlwifi: rtl8821ae: Simplify loading of WOWLAN firmware 2014-12-24 18:28:56 +02:00
core.h rtlwifi: rtl8821ae: Simplify loading of WOWLAN firmware 2014-12-24 18:28:56 +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: Modify cam.{c,h} and efuse.{c,h} for new drivers 2014-09-26 17:22:28 -04: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 error when accessing unmapped memory in skb 2015-01-05 10:05:44 +02:00
pci.h rtlwifi: rtl_pci: Start modification for new drivers 2014-09-26 17:22:27 -04: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: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
stats.h rtlwifi: Finish modifying core routines for new drivers 2014-09-26 17:22:28 -04:00
usb.c rtl8192cu: Call ieee80211_register_hw from rtl_usb_probe 2014-10-23 14:02:07 -04:00
usb.h rtlwifi: usb: defer rx processing to tasklet 2013-03-25 16:42:22 -04:00
wifi.h rtlwifi: rtl8821ae: Add VHT rate descriptors 2014-12-24 18:33:05 +02:00