Ingo Molnar 28cff52eae Merge branch 'linus' into locking/core, to resolve conflict ... Conflicts: arch/arm/include/asm/percpu.h As Stephen Rothwell noted, there's a conflict between this commit in locking/core: a21ee6055c ("lockdep: Change hardirq{s_enabled,_context} to per-cpu variables") and this fresh upstream commit: aa54ea903a ("ARM: percpu.h: fix build error") a21ee6055c is a simpler solution to the dependency problem and doesn't further increase header hell - so this conflict resolution effectively reverts aa54ea903a and uses the a21ee6055c solution. Signed-off-by: Ingo Molnar <mingo@kernel.org>		2020-07-31 12:16:09 +02:00
..
asm	Merge branch 'linus' into locking/core, to resolve conflict	2020-07-31 12:16:09 +02:00
cpu-common/cpu	sh: include: convert to SPDX identifiers	2018-12-28 12:11:45 -08:00
cpu-sh2/cpu	sh: include: convert to SPDX identifiers	2018-12-28 12:11:45 -08:00
cpu-sh2a/cpu	sh: sh7269: Remove bogus SSU GPIO function definitions	2019-12-31 10:01:38 +01:00
cpu-sh3/cpu	sh: include: convert to SPDX identifiers	2018-12-28 12:11:45 -08:00
cpu-sh4/cpu	pinctrl: sh-pfc: sh7734: Fix duplicate TCLK1_B	2019-11-01 13:42:52 +01:00
cpu-sh4a/cpu	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mach-common/mach	sh: mach-highlander: Fix comment spelling	2020-03-17 20:51:31 +01:00
mach-dreamcast/mach	Merge branch 'akpm' (patches from Andrew)	2018-12-28 16:55:46 -08:00
mach-ecovec24/mach	sh: include: convert to SPDX identifiers	2018-12-28 12:11:45 -08:00
mach-kfr2r09/mach	sh: include: convert to SPDX identifiers	2018-12-28 12:11:45 -08:00
mach-landisk/mach	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mach-migor/mach	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mach-sdk7786/mach	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mach-se/mach	sh: include: convert to SPDX identifiers	2018-12-28 12:11:45 -08:00
mach-sh03/mach	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
mach-x3proto/mach	License cleanup: add SPDX GPL-2.0 license identifier to files with no license	2017-11-02 11:10:55 +01:00
uapi/asm	sh: remove sh5 support	2020-06-01 14:48:52 -04:00