arch/x86/include/uapi/asm/bootparam.h · 4729277156cf18acd9b9b04d6ef8c2a8a7bf00dc · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'linus' into WIP.x86/boot, to fix up conflicts and to pick up updates · 0871d5a6
Ingo Molnar authored Mar 01, 2017
```
 Conflicts:
	arch/x86/xen/setup.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
0871d5a6

bootparam.h 6.89 KB