diff options
| author | Leah Rowe <info@minifree.org> | 2016-09-19 00:37:14 +0100 |
|---|---|---|
| committer | Leah Rowe <info@minifree.org> | 2016-09-19 01:13:51 +0100 |
| commit | b50e80a683d4707bdec1a0bc37069c8edb152a9f (patch) | |
| tree | e3ec76a0ece58f7ddacd9fb7873b296e01a12856 /resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60 | |
| parent | 8d2b793226389da8611b214eb6d2b9c81b10629d (diff) | |
| download | librebootfr-b50e80a683d4707bdec1a0bc37069c8edb152a9f.tar.gz librebootfr-b50e80a683d4707bdec1a0bc37069c8edb152a9f.zip | |
fix merge confict when running ./build module coreboot
patch that already exists in the coreboot revision used is still being applied.
delete the patch from libreboot
Diffstat (limited to 'resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60')
| -rw-r--r-- | resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list b/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list index 558706ff..bda66eda 100644 --- a/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list +++ b/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list @@ -1,5 +1,4 @@ /resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-NOTFORMERGE-ec-lenovo-h8-wlan-trackpoint-touchpad-bl.patch -/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0001-i945-Enable-changing-VRAM-size.patch /resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0003-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch /resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0004-model_6ex-enable-C2E-C4E-dynamic-lvl-2-cache.patch /resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/x60/0005-i945-gma.c-use-latest-linux-code-to-calculate-diviso.patch |