debian-packaging
/
linux
8
0
Fork 0
Code Releases Activity

Merge changes from sid up to 3.12.6-2 

svn path=/dists/trunk/linux/; revision=20931
This commit is contained in:
Ben Hutchings 2013-12-29 21:45:11 +00:00
parent 049c93d9cc
commit 0363adb1e1
3 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
debian/changelog vendored
View File

@ -11,6 +11,16 @@ linux (3.13~rc4-1~exp1) UNRELEASED; urgency=low
-- Ben Hutchings <ben@decadent.org.uk> Sat, 21 Dec 2013 17:41:34 +0000
linux (3.12.6-2) unstable; urgency=medium
[ Bastian Blank ]
* [x86] Make MICROCODE built-in for early microcode loading.
[ Ben Hutchings ]
* [armhf] linux-headers: Fix typo in compiler dependency
-- Ben Hutchings <ben@decadent.org.uk> Sun, 29 Dec 2013 16:56:20 +0100
linux (3.12.6-1) unstable; urgency=medium
* New upstream stable update:

2
debian/config/armhf/defines vendored
View File

@ -11,7 +11,7 @@ configs:
armhf/config
[relations]
headers%gcc-4.8: linux-compiler-gcc-4.8--arm
headers%gcc-4.8: linux-compiler-gcc-4.8-arm
[armmp_build]
image-file: arch/arm/boot/zImage

2
debian/config/kernelarch-x86/config vendored
View File

@ -31,7 +31,7 @@ CONFIG_X86_MCE_AMD=y
# CONFIG_X86_ANCIENT_MCE is not set
CONFIG_X86_MCE_INJECT=m
CONFIG_I8K=m
CONFIG_MICROCODE=m
CONFIG_MICROCODE=y
CONFIG_MICROCODE_INTEL=y
CONFIG_MICROCODE_AMD=y
CONFIG_X86_MSR=m