Fix a mismerge that makes arm not boot.
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
461d6dbacc
commit
331d9e4d84
70 changed files with 75 additions and 74 deletions
|
|
@ -1,4 +1,4 @@
|
|||
From de0c8783e1177f81fe2ac90edbfdc282ae986803 Mon Sep 17 00:00:00 2001
|
||||
From 17f5bd6c5f9c7d9e7ec922852038dcdfe9f52e86 Mon Sep 17 00:00:00 2001
|
||||
From: Matthew Garrett <mjg59@coreos.com>
|
||||
Date: Sun, 9 Aug 2015 16:20:58 -0700
|
||||
Subject: [PATCH 157/192] Rework linux16 command
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue