leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5f013c9bc7
linux/drivers/net/wireless/rtlwifi
History
David S. Miller 5f013c9bc7 Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 
Conflicts:
	drivers/net/ethernet/altera/altera_sgdma.c
	net/netlink/af_netlink.c
	net/sched/cls_api.c
	net/sched/sch_api.c

The netlink conflict dealt with moving to netlink_capable() and
netlink_ns_capable() in the 'net' tree vs. supporting 'tc' operations
in non-init namespaces.  These were simple transformations from
netlink_capable to netlink_ns_capable.

The Altera driver conflict was simply code removal overlapping some
void pointer cast cleanups in net-next.

Signed-off-by: David S. Miller <davem@davemloft.net>
2014-05-12 13:19:14 -04:00
..
btcoexist rtlwifi: btcoexist: remove undefined Kconfig macros 2014-04-09 13:55:54 -04:00
rtl8188ee Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net 2014-05-12 13:19:14 -04:00
rtl8192c rtlwifi: rtl8192c-common: Fix sparse warning 2013-12-09 15:37:55 -05:00
rtl8192ce rtlwifi: Remove casts of pointer to same type 2014-03-27 14:20:05 -04:00
rtl8192cu rtl8192cu: Fix unbalanced irq enable in error path of rtl92cu_hw_init() 2014-04-30 12:22:52 -04:00
rtl8192de rtlwifi: Move common routines to core 2014-03-06 14:29:56 -05:00
rtl8192se rtlwifi: rtl8192se: Fix regression due to commit 1bf4bbb 2014-04-30 12:22:52 -04:00
rtl8723ae rtlwifi: Remove casts of pointer to same type 2014-03-27 14:20:05 -04:00
rtl8723be rtlwifi: rtl8723be: disable MSI interrupts mode 2014-04-30 12:08:17 -04:00
rtl8723com rtlwifi: Remove casts of pointer to same type 2014-03-27 14:20:05 -04:00
base.c Merge branch 'for-john' of git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next 2014-01-13 14:40:59 -05:00
base.h rtlwifi: Implement a common rtl_phy_scan_operation_backup() routine 2013-10-03 16:24:30 -04:00
cam.c rtlwifi: slight optimization of addr compare 2013-12-26 13:31:35 -05:00
cam.h rtlwifi: Remove extern from function prototypes 2013-09-24 18:06:51 -07:00
core.c mac80211: add vif to flush call 2014-04-09 10:55:29 +02:00
core.h rtlwifi: Move common routines to core 2014-03-06 14:29:56 -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 rtlwifi: fix null dereference on efuse_word on kmalloc fail returns NULL 2013-11-11 14:38:58 -05:00
efuse.h rtlwifi: Remove extern from function prototypes 2013-09-24 18:06:51 -07:00
Kconfig rtlwifi: rtl8723be: Add new driver 2014-03-04 13:25:39 -05:00
Makefile rtlwifi: rtl8723be: Add new driver 2014-03-04 13:25:39 -05:00
pci.c rtlwifi: add MSI interrupts mode support 2014-03-31 13:47:41 -04:00
pci.h rtlwifi: rtl8192ce: rtl8192cu: rtl8192de: rtl8192se: rtl8723ae: rtl8723be: rtl8188eu: Modify for new API 2014-03-06 14:29:56 -05:00
ps.c rtlwifi: Remove casts of pointer to same type 2014-03-27 14:20:05 -04:00
ps.h rtlwifi: Move common routines to core 2014-03-06 14:29:56 -05:00
rc.c mac80211: remove module handling from rate control ops 2014-02-04 21:48:26 +01:00
rc.h
regd.c rtlwifi: fix usage of freq_reg_info() 2013-12-05 14:54:51 -05:00
regd.h wireless: make the reg_notifier() void 2013-01-14 11:32:44 +01:00
stats.c rtlwifi: Add missing code to PWDB statics routine 2013-12-05 14:55:20 -05:00
stats.h rtlwifi: Modify files for addition of rtl8723ae 2012-11-14 14:55:30 -05:00
usb.c rtlwifi: rtl8192ce: rtl8192cu: rtl8192de: rtl8192se: rtl8723ae: rtl8723be: rtl8188eu: Modify for new API 2014-03-06 14:29:56 -05:00
usb.h rtlwifi: usb: defer rx processing to tasklet 2013-03-25 16:42:22 -04:00
wifi.h rtlwifi: rtl8723be: Fix smatch warnings 2014-03-06 14:29:57 -05:00