diff --git a/config-armv7-lpae b/config-armv7-lpae index 78de75b09..9ed69d67b 100644 --- a/config-armv7-lpae +++ b/config-armv7-lpae @@ -138,3 +138,4 @@ CONFIG_S3C_LOWLEVEL_UART_PORT=1 # CONFIG_MMC_SDHCI_S3C is not set # CONFIG_TEGRA_HOST1X is not set # CONFIG_SPI_DAVINCI is not set +# CONFIG_I2C_DAVINCI is not set diff --git a/config-generic b/config-generic index d64d6d3c7..8fa673b15 100644 --- a/config-generic +++ b/config-generic @@ -2643,6 +2643,7 @@ CONFIG_DRM_MGAG200=m # do not enable on f17 or older # CONFIG_DRM_SAVAGE is not set CONFIG_DRM_I915=m CONFIG_DRM_I915_KMS=y +# CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT is not set CONFIG_DRM_VIA=m CONFIG_DRM_NOUVEAU=m CONFIG_NOUVEAU_DEBUG=5 diff --git a/kernel.spec b/kernel.spec index 92dbccbef..1c9a6ad80 100644 --- a/kernel.spec +++ b/kernel.spec @@ -95,7 +95,7 @@ Summary: The Linux kernel # The rc snapshot level %define rcrev 0 # The git snapshot level -%define gitrev 11 +%define gitrev 12 # Set rpm version accordingly %define rpmversion 3.%{upstream_sublevel}.0 %endif @@ -1338,7 +1338,7 @@ ApplyPatch arm-lpae-ax88796.patch ApplyPatch arm-sound-soc-samsung-dma-avoid-another-64bit-division.patch ApplyPatch arm-exynos-mp.patch ApplyPatch arm-highbank-for-3.12.patch -ApplyPatch arm-omap-load-tfp410.patch +#pplyPatch arm-omap-load-tfp410.patch ApplyPatch arm-tegra-usb-no-reset-linux33.patch ApplyPatch arm-wandboard-quad.patch @@ -2315,6 +2315,9 @@ fi # ||----w | # || || %changelog +* Thu Sep 05 2013 Josh Boyer - 3.12.0-0.rc0.git12.1 +- Linux v3.11-4809-ga09e9a7 + * Thu Sep 05 2013 Josh Boyer - 3.12.0-0.rc0.git11.1 - Fix perf build on ARM (from Kyle McMartin) diff --git a/sources b/sources index 6c0a7e144..59121a16a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ fea363551ff45fbe4cb88497b863b261 linux-3.11.tar.xz -ae83dc4ffaba904f71be129a83d992b8 patch-3.11-git11.xz +915fe75bceba442369dca05e12614ea0 patch-3.11-git12.xz