diff options
author | Leah Rowe <info@minifree.org> | 2016-09-20 22:01:30 +0100 |
---|---|---|
committer | Leah Rowe <info@minifree.org> | 2016-09-20 22:01:30 +0100 |
commit | 1ca2f481ec82afef16b0ee85d122a5d6d7e5aab2 (patch) | |
tree | 1013ba140ed5e7f9b9956b112959692ca81ecedb /resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60 | |
parent | c3b759e2271cf9aa48a758e5f7cae2ffc0f1f0b9 (diff) | |
download | librebootfr-1ca2f481ec82afef16b0ee85d122a5d6d7e5aab2.tar.gz librebootfr-1ca2f481ec82afef16b0ee85d122a5d6d7e5aab2.zip |
Revert "fix merge confict when running ./build module coreboot"
This reverts commit b50e80a683d4707bdec1a0bc37069c8edb152a9f.
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, 1 insertions, 0 deletions
diff --git a/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list b/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list index bda66eda..558706ff 100644 --- a/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list +++ b/resources/libreboot/patch/coreboot/29fc9bb855cb878aee263cd1fe110e3bb3e98c80/grub/t60/reused.list @@ -1,4 +1,5 @@ /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 |