summaryrefslogtreecommitdiff
path: root/lib/fdt_sw.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-11-10 08:06:47 +0100
committerIngo Molnar <mingo@kernel.org>2017-11-10 08:06:47 +0100
commit91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb (patch)
treedbea28420ff33aca40be8d3cd901305064b4ea24 /lib/fdt_sw.c
parentd04fdafc066fed10cc9610b2f36f1d0ff0327864 (diff)
parent1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff)
Merge branch 'linus' into x86/asm, to resolve conflict
Conflicts: arch/x86/mm/mem_encrypt.c Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/fdt_sw.c')
0 files changed, 0 insertions, 0 deletions