diff --git a/config-arm-generic b/config-arm-generic index 2bd045aca..1a89e6384 100644 --- a/config-arm-generic +++ b/config-arm-generic @@ -179,3 +179,6 @@ CONFIG_FTGMAC100=m # CONFIG_ARM_KPROBES_TEST is not set # CONFIG_PL330_DMA is not set # CONFIG_VIDEO_S5K6AA is not set + +CONFIG_PL310_ERRATA_753970=y +CONFIG_PL310_ERRATA_769419=y diff --git a/kernel.spec b/kernel.spec index 6abef8363..4900519b3 100644 --- a/kernel.spec +++ b/kernel.spec @@ -85,9 +85,9 @@ Summary: The Linux kernel # The next upstream release sublevel (base_sublevel+1) %define upstream_sublevel %(echo $((%{base_sublevel} + 1))) # The rc snapshot level -%define rcrev 3 +%define rcrev 4 # The git snapshot level -%define gitrev 2 +%define gitrev 0 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -2171,6 +2171,9 @@ fi # ||----w | # || || %changelog +* Thu Dec 01 2011 Dave Jones +- Linux 3.2-rc4 + * Thu Dec 01 2011 Dave Jones - Linux 3.2-rc3-git2 (b930c26416c4ea6855726fd977145ccea9afbdda) diff --git a/sources b/sources index 6a5a6d97e..c9e3facec 100644 --- a/sources +++ b/sources @@ -1,4 +1,3 @@ 8d43453f8159b2332ad410b19d86a931 linux-3.1.tar.bz2 -11f19e852610d574d79c295d2c452fd5 patch-3.2-rc3.xz 77da243ea639c14679d67788b2b72f41 compat-wireless-2011-11-15.tar.bz2 -41b9f90fecb9de389eca8f3e24b9ea00 patch-3.2-rc3-git2.xz +0f8c09d8ad9dda10166196cf1b5679bb patch-3.2-rc4.xz