David S. Miller c4c5551df1 Merge ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux ... All conflicts were trivial overlapping changes, so reasonably easy to resolve. Signed-off-by: David S. Miller <davem@davemloft.net>		2018-07-20 21:17:12 -07:00
..
btcoexist	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
halmac	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
phydm	staging: rtlwifi: fix spelling mistake: "Platfoem" -> "Platform"	2018-05-25 18:44:13 +02:00
rtl8822be	staging: r8822be: Fix RTL8822be can't find any wireless AP	2018-07-06 17:44:35 +02:00
Kconfig	Kconfig updates for v4.16	2018-02-01 11:45:49 -08:00
Makefile	staging: r8822be: Add Makefiles and Kconfig for new driver	2017-08-20 11:13:12 -07:00
TODO	staging: rtlwifi: Reviewers fixes	2017-08-20 11:13:12 -07:00
base.c	ieee80211: bump IEEE80211_MAX_AMPDU_BUF to support HE	2018-06-18 22:39:39 +02:00
base.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
cam.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
cam.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
core.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
core.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
debug.c	staging: rtlwifi: don't check the return value of debugfs_create_file	2018-06-01 10:47:43 +02:00
debug.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
efuse.c	treewide: kzalloc() -> kcalloc()	2018-06-12 16:19:22 -07:00
efuse.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
pci.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
pci.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
ps.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
ps.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
pwrseqcmd.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
rc.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
rc.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
regd.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
regd.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
stats.c	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
stats.h	staging: rtlwifi: Replace license boilerplate with SPDX identifiers	2018-05-06 19:01:29 -07:00
wifi.h	staging: r8822be: Fix RTL8822be can't find any wireless AP	2018-07-06 17:44:35 +02:00