Ingo Molnar 8c5db92a70 Merge branch 'linus' into locking/core, to resolve conflicts ...

Conflicts:
	include/linux/compiler-clang.h
	include/linux/compiler-gcc.h
	include/linux/compiler-intel.h
	include/uapi/linux/stddef.h

Signed-off-by: Ingo Molnar <mingo@kernel.org>

2017-11-07 10:32:44 +01:00

..

board-paz00.c

ARM: tegra: paz00: Fix __initdata placement

2017-01-25 09:09:32 +01:00

board.h

ARM: tegra: Convert PMC to a driver

2014-07-17 14:58:43 +02:00

common.h

ARM: tegra: hotplug: Include missing common.h

2016-06-10 16:17:58 +02:00

cpuidle-tegra20.c

locking/atomics: COCCINELLE/treewide: Convert trivial ACCESS_ONCE() patterns to READ_ONCE()/WRITE_ONCE()

2017-10-25 11:01:08 +02:00

cpuidle-tegra30.c

ARM: tegra: cpuidle: Add missing cpuidle.h include

2016-06-10 16:17:59 +02:00

cpuidle-tegra114.c

PM / s2idle: Rename ->enter_freeze to ->enter_s2idle

2017-08-11 01:29:56 +02:00

cpuidle.c

ARM: tegra: Use a function to get the chip ID

2014-07-17 13:36:41 +02:00

cpuidle.h

ARM: tegra: cpuidle: Add missing cpuidle.h include

2016-06-10 16:17:59 +02:00

hotplug.c

ARM: tegra: hotplug: Include missing common.h

2016-06-10 16:17:58 +02:00

io.c

ARM: tegra: Sort includes alphabetically

2014-07-17 13:29:57 +02:00

iomap.h

soc/tegra: fuse: Unify Tegra20 and Tegra30 drivers

2015-07-16 10:38:28 +02:00

irammap.h

ARM: tegra: move resume vector define to irammap.h

2013-09-17 13:44:22 -06:00

irq.c

ARM: tegra: irq: Add missing irq.h include

2016-06-10 16:18:00 +02:00

irq.h

ARM: tegra: remove old LIC support

2015-03-15 00:40:52 +00:00

Kconfig

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

Makefile

License cleanup: add SPDX GPL-2.0 license identifier to files with no license

2017-11-02 11:10:55 +01:00

platsmp.c

soc/tegra: Move Tegra flowctrl driver

2017-04-04 15:48:04 +02:00

pm-tegra20.c

ARM: tegra: Sort includes alphabetically

2014-07-17 13:29:57 +02:00

pm-tegra30.c

ARM: tegra: Sort includes alphabetically

2014-07-17 13:29:57 +02:00

pm.c

soc/tegra: Move Tegra flowctrl driver

2017-04-04 15:48:04 +02:00

pm.h

ARM: tegra: pm: Add tegra_cpu_do_idle() prototype

2016-06-10 16:18:01 +02:00

reset-handler.S

soc/tegra: Move Tegra flowctrl driver

2017-04-04 15:48:04 +02:00

reset.c

ARM: 8641/1: treewide: Replace uses of virt_to_phys with __pa_symbol

2017-02-28 11:06:10 +00:00

reset.h

ARM: SoC: platform support for v4.2

2015-06-26 11:34:35 -07:00

sleep-tegra20.S

soc/tegra: Move Tegra flowctrl driver

2017-04-04 15:48:04 +02:00

sleep-tegra30.S

soc/tegra: Move Tegra flowctrl driver

2017-04-04 15:48:04 +02:00

sleep.h

ARM: tegra20: Store CPU "resettable" status in IRAM

2015-05-04 12:58:19 +02:00

sleep.S

ARM: tegra: Remove unnecessary inclusion of flowctrl header

2017-04-04 15:43:52 +02:00

tegra.c

soc/tegra: Register SoC device

2017-08-17 16:43:13 +02:00