Greg Kroah-Hartman 1f77f18bb8 Merge a45ad71e89 ("Merge tag 'rproc-v5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/andersson/remoteproc") into android-mainline ... Another "small" merge point to handle conflicts in a sane way. Signed-off-by: Greg Kroah-Hartman <gregkh@google.com> Change-Id: I5dc2f5f11275b29f3c9b5b8d4dd59864ceb6faf9		2020-02-08 13:32:37 +01:00
..
boot	ARC: [plat-axs10x]: Add missing multicast filter number to GMAC node	2020-01-14 09:03:10 -08:00
configs	ARC updates for 5.5-rc1	2019-12-04 19:06:18 -08:00
include	arc: mm: add p?d_leaf() definitions	2020-02-04 03:05:24 +00:00
kernel	ARC updates for 5.6-rc1	2020-01-31 11:26:11 -08:00
lib	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
mm	Linux 5.5-rc1	2019-12-09 12:12:00 +01:00
oprofile	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
plat-axs10x	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 500	2019-06-19 17:09:55 +02:00
plat-eznps	arc: eznps: fix allmodconfig kconfig warning	2019-12-09 10:40:03 -08:00
plat-hsdk	ARC: [plat-hsdk]: allow to switch between AXI DMAC port configurations	2019-08-05 19:25:57 +05:30
plat-sim	ARC: merge HAPS-HS with nSIM-HS configs	2019-10-28 12:12:31 -07:00
plat-tb10x	treewide: Replace GPLv2 boilerplate/reference with SPDX - rule 333	2019-06-05 17:37:06 +02:00
Kbuild	treewide: Add SPDX license identifier - Kbuild	2019-05-30 11:32:33 -07:00
Kconfig	ARC updates for 5.6-rc1	2020-01-31 11:26:11 -08:00
Kconfig.debug	Kconfig: consolidate the "Kernel hacking" menu	2018-08-02 08:06:48 +09:00
Makefile	ARC: merge HAPS-HS with nSIM-HS configs	2019-10-28 12:12:31 -07:00