Commit 2eb06abc authored by Tails developers's avatar Tails developers
Browse files

Merge branch 'feature/linux-3.16-2' into stable

parents 1e67d735 cf11d9eb
......@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
--memtest none \
--packages-lists="standard" \
--tasks="standard" \
--linux-packages="linux-image-3.16-1" \
--linux-packages="linux-image-3.16-2" \
--syslinux-menu vesamenu \
--syslinux-splash data/splash.png \
--syslinux-timeout 4 \
......
......@@ -114,19 +114,19 @@ Package: linux-headers-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-1-common
Package: linux-headers-3.16-2-common
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-1-486
Package: linux-headers-3.16-2-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-1-686-pae
Package: linux-headers-3.16-2-686-pae
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-headers-3.16-1-amd64
Package: linux-headers-3.16-2-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......@@ -142,15 +142,15 @@ Package: linux-image-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.16-1-486
Package: linux-image-3.16-2-486
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.16-1-686-pae
Package: linux-image-3.16-2-686-pae
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: linux-image-3.16-1-amd64
Package: linux-image-3.16-2-amd64
Pin: release o=Debian,a=unstable
Pin-Priority: 999
......
Markdown is supported
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