UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity
OpenCloudOS-Kernel/drivers/net/wireless/rtlwifi
History
David S. Miller 0fa74a4be4 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/emulex/benet/be_main.c
	net/core/sysctl_net_core.c
	net/ipv4/inet_diag.c

The be_main.c conflict resolution was really tricky.  The conflict
hunks generated by GIT were very unhelpful, to say the least.  It
split functions in half and moved them around, when the real actual
conflict only existed solely inside of one function, that being
be_map_pci_bars().

So instead, to resolve this, I checked out be_main.c from the top
of net-next, then I applied the be_main.c changes from 'net' since
the last time I merged.  And this worked beautifully.

The inet_diag.c and sysctl_net_core.c conflicts were simple
overlapping changes, and were easily to resolve.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2015-03-20 18:51:09 -04:00
..
btcoexist rtlwifi: btcoexist: Fix Smatch warning 2014-09-26 17:22:27 -04:00
rtl8188ee rtlwifi: rtl8188ee: missing curly braces in handle_branch1() 2015-03-03 15:40:47 +02: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 case in rtl92cu_get_hw_reg 2015-03-03 15:45:35 +02:00
rtl8192de rtlwifi: Remove unused RF6052_MAX_REG define 2015-03-03 15:30:03 +02:00
rtl8192ee rtlwifi: Remove unused RF6052_MAX_REG define 2015-03-03 15:30:03 +02:00
rtl8192se rtlwifi: Remove unused defines from driver-specific def.h 2015-03-03 15:30:01 +02:00
rtl8723ae rtlwifi: Remove unused RF6052_MAX_REG define 2015-03-03 15:30:03 +02:00
rtl8723be rtlwifi: Remove unused RF6052_MAX_REG define 2015-03-03 15:30:03 +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: Remove duplicate hex prefixes 2015-03-03 15:39:34 +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
base.c rtlwifi: Improve handling of IPv6 packets 2015-03-03 17:07:05 +02:00
base.h rtlwifi: Remove unused defines from base.h 2015-03-03 15:30:06 +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
pci.c rtlwifi: Remove logging statement that is no longer needed 2015-02-10 16:09:11 +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: 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 rtlwifi: Modify some USB de-initialize code. 2015-02-27 10:05:26 +02:00
usb.h rtlwifi: usb: defer rx processing to tasklet 2013-03-25 16:42:22 -04:00
wifi.h rtlwifi: rtl8192ee: Fix handling of new style descriptors 2015-02-06 08:36:00 +02:00