Commit 599d97a2 authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'bugfix/back-to-linux-3.10' into devel

parents ecf4f0ea 05dcca3d
......@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
--memtest none \
--packages-lists="standard" \
--tasks="standard" \
--linux-packages="linux-image-3.11-2" \
--linux-packages="linux-image-3.10-3" \
--syslinux-menu vesamenu \
--syslinux-splash data/splash.png \
--syslinux-timeout 4 \
......
......@@ -251,19 +251,19 @@ Package: linux-headers-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.11-2-common
Package: linux-headers-3.10-3-common
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.11-2-486
Package: linux-headers-3.10-3-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.11-2-686-pae
Package: linux-headers-3.10-3-686-pae
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.11-2-amd64
Package: linux-headers-3.10-3-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
......@@ -279,19 +279,19 @@ Package: linux-image-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.11-2-486
Package: linux-image-3.10-3-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.11-2-686-pae
Package: linux-image-3.10-3-686-pae
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.11-2-amd64
Package: linux-image-3.10-3-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-kbuild-3.11
Package: linux-kbuild-3.10
Pin: release o=Debian,a=testing
Pin-Priority: 999
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment