Commit d3b2a538 authored by Tails developers's avatar Tails developers

Merge branch 'feature/linux-3.12' into stable

parents e64095e5 10803c90
......@@ -35,7 +35,7 @@ $RUN_LB_CONFIG \
--memtest none \
--packages-lists="standard" \
--tasks="standard" \
--linux-packages="linux-image-3.10-3" \
--linux-packages="linux-image-3.12-1" \
--syslinux-menu vesamenu \
--syslinux-splash data/splash.png \
--syslinux-timeout 4 \
......
......@@ -259,6 +259,10 @@ Package: linux-base
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-compiler-gcc-4.8-x86
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
......@@ -271,19 +275,19 @@ Package: linux-headers-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-common
Package: linux-headers-3.12-1-common
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-486
Package: linux-headers-3.12-1-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-686-pae
Package: linux-headers-3.12-1-686-pae
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-headers-3.10-3-amd64
Package: linux-headers-3.12-1-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
......@@ -299,20 +303,20 @@ Package: linux-image-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.10-3-486
Package: linux-image-3.12-1-486
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.10-3-686-pae
Package: linux-image-3.12-1-686-pae
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-image-3.10-3-amd64
Package: linux-image-3.12-1-amd64
Pin: release o=Debian,a=testing
Pin-Priority: 999
Package: linux-kbuild-3.10
Pin: release o=Debian,a=testing
Package: linux-kbuild-3.12
Pin: release o=Debian,a=unstable
Pin-Priority: 999
Package: laptop-mode-tools
......
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