Fix a mismerge that makes arm not boot.

Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
Peter Jones 2017-08-16 11:34:58 -04:00
commit 331d9e4d84
70 changed files with 75 additions and 74 deletions

View file

@ -1,4 +1,4 @@
From c75fd7cc69873a8347a536aa760c019990b3c7a1 Mon Sep 17 00:00:00 2001
From 8c04cd7ab27fadf834df9f2f4d767b100547c190 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59@coreos.com>
Date: Sun, 9 Aug 2015 16:12:39 -0700
Subject: [PATCH 156/192] Rework linux command