Merge branch 'upstream'

Merge modified history created using convert-branch.sh from
packages/grub upstream branch.

1 files changed, 5 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b19c8fce09e3..7c0b777196b7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
 pkgbase = grub-linux-default
 	pkgdesc = GNU GRand Unified Bootloader (2) with linux as the default kernel
 	pkgver = 2.02
-	pkgrel = 3
+	pkgrel = 4
 	epoch = 2
 	url = https://www.gnu.org/software/grub/
 	install = grub.install
 	arch = x86_64
-	arch = i686
 	license = GPL3
 	makedepends = git
 	makedepends = rsync
@@ -56,7 +55,8 @@ pkgbase = grub-linux-default
 	source = 0003-10_linux-detect-archlinux-initramfs.patch
 	source = 0004-add-GRUB_COLOR_variables.patch
 	source = 0005-Allow_GRUB_to_mount_ext234_filesystems_that_have_the_encryption_feature.patch
-	source = 0006-default-kernel.patch
+	source = 0006-tsc-Change-default-tsc-calibration-method-to-pmtimer-on-EFI-systems.patch
+	source = 0000-default-kernel.patch
 	source = grub.default
 	source = grub.cfg
 	validpgpkeys = E53D497F3FA42AD8C9B4D1E835A93B74E82E4209
@@ -70,8 +70,10 @@ pkgbase = grub-linux-default
 	sha256sums = b41e4438319136b5e74e0abdfcb64ae115393e4e15207490272c425f54026dd3
 	sha256sums = a5198267ceb04dceb6d2ea7800281a42b3f91fd02da55d2cc9ea20d47273ca29
 	sha256sums = 535422c510a050d41efe7720dbe54de29e04bdb8f86fd5aea5feb0b24f7abe46
+	sha256sums = c38f2b2caae33008b35a37d8293d8bf13bf6fd779a4504925da1837fd007aeb5
 	sha256sums = 55e383e6693f47c0951806e76397d4da5f5a77c3b77f8b84479bf67b0bfb0017
 	sha256sums = 74e5dd2090a153c10a7b9599b73bb09e70fddc6a019dd41641b0f10b9d773d82
 	sha256sums = c5e4f3836130c6885e9273c21f057263eba53f4b7c0e2f111f6e5f2e487a47ad
 
 pkgname = grub-linux-default
+