diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-01-31 08:38:17 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-01-31 08:38:17 +0100 |
| commit | f26483eaedec39b09b1f2bdfc3f0d18f86764327 (patch) | |
| tree | 4d5b94adb85d84517462d4883c59cbf3af5dd116 /include/video/udlfb.h | |
| parent | da0aa3dde05108e180eecd76534c55f43ea4b9c8 (diff) | |
| parent | 24c2503255d35c269b67162c397a1a1c1e02f6ce (diff) | |
Merge branch 'x86/urgent' into x86/microcode, to resolve conflicts
Conflicts:
arch/x86/kernel/cpu/microcode/amd.c
arch/x86/kernel/cpu/microcode/core.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/video/udlfb.h')
0 files changed, 0 insertions, 0 deletions