q3k
/
linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
linux/drivers/net/wireless/rtlwifi
History
David S. Miller 188d1f76d0 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/intel/e1000e/ethtool.c
	drivers/net/vmxnet3/vmxnet3_drv.c
	drivers/net/wireless/iwlwifi/dvm/tx.c
	net/ipv6/route.c

The ipv6 route.c conflict is simple, just ignore the 'net' side change
as we fixed the same problem in 'net-next' by eliminating cached
neighbours from ipv6 routes.

The e1000e conflict is an addition of a new statistic in the ethtool
code, trivial.

The vmxnet3 conflict is about one change in 'net' removing a guarding
conditional, whilst in 'net-next' we had a netdev_info() conversion.

The iwlwifi conflict is dealing with a WARN_ON() conversion in
'net-next' vs. a revert happening in 'net'.

Signed-off-by: David S. Miller <davem@davemloft.net>
 		2013-02-05 14:12:20 -05:00
..
rtl8192c rtlwifi: Fix typo in debug output of rtl8192c and rtl8723ae 2013-01-07 14:32:24 -05:00
rtl8192ce rtlwifi: rtl8192ce: Fix warning for unchecked pci_map_single() call 2013-01-02 14:38:32 -05:00
rtl8192cu Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2012-11-21 14:43:51 -05:00
rtl8192de Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-01-28 13:54:03 -05:00
rtl8192se Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless 2013-01-28 13:54:03 -05:00
rtl8723ae Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem 2013-01-28 14:43:00 -05:00
Kconfig rtlwifi: Fix build warning introduced by commit a290593 2013-01-22 14:33:43 -05:00
Makefile rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver 2012-11-14 14:55:31 -05:00
base.c rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver 2012-11-14 14:55:31 -05:00
base.h rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver 2012-11-14 14:55:31 -05:00
cam.c rtlwifi: use eth_zero_addr() to assign zero address 2012-11-16 14:29:07 -05:00
cam.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
core.c mac80211: split TX aggregation stop action 2013-01-03 13:01:42 +01:00
core.h rtlwifi: Convert to asynchronous firmware load 2012-01-30 15:48:50 -05:00
debug.c rtlwifi: Move pr_fmt macros to a single location 2012-01-30 15:48:23 -05:00
debug.h rtlwifi: Modify files for addition of rtl8723ae 2012-11-14 14:55:30 -05:00
efuse.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
efuse.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
pci.c rtlwifi: Fix warning for unchecked pci_map_single() call 2013-01-02 14:38:31 -05:00
pci.h rtlwifi: remove __dev* attributes 2012-12-06 15:06:15 -05:00
ps.c wireless: Remove casts to same type 2012-06-06 09:31:33 -07:00
ps.h rtlwifi: Update copyright dates 2012-01-24 14:08:37 -05:00
rc.c rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver 2012-11-14 14:55:31 -05: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 the usage of the wrong variable in usb.c 2013-01-28 14:48:53 -05:00
usb.h rtlwifi: remove __dev* attributes 2012-12-06 15:06:15 -05:00
wifi.h rtlwifi: rtl8192ce: rtl8192cu: rtl8192se: rtl81723ae: Turn on building of the new driver 2012-11-14 14:55:31 -05:00