summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustin M. Forbes <jforbes@redhat.com>2013-07-26 16:02:53 -0500
committerJustin M. Forbes <jforbes@redhat.com>2013-07-26 16:02:53 -0500
commitad160eb1e136cff634170d7331e39af8a69178a2 (patch)
treeaead8e97d727e85aac753cad93e443c4ebebc613
parent6ffcd175ea695f61f29f1586287cebdd577e7da1 (diff)
downloadkernel-ad160eb1e136cff634170d7331e39af8a69178a2.tar.gz
kernel-ad160eb1e136cff634170d7331e39af8a69178a2.tar.xz
kernel-ad160eb1e136cff634170d7331e39af8a69178a2.zip
Linux v3.11-rc2-333-ga9b5f02
-rw-r--r--config-armv7-generic1
-rw-r--r--kernel.spec5
-rw-r--r--sources2
3 files changed, 6 insertions, 2 deletions
diff --git a/config-armv7-generic b/config-armv7-generic
index 0b12a279b..d1f1d450b 100644
--- a/config-armv7-generic
+++ b/config-armv7-generic
@@ -461,3 +461,4 @@ CONFIG_BPF_JIT=y
# FIX ME
# CONFIG_FB_XILINX is not set
+CONFIG_AHCI_IMX=m
diff --git a/kernel.spec b/kernel.spec
index 5ce83d67f..bce0d3b4c 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -95,7 +95,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 3
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2248,6 +2248,9 @@ fi
# ||----w |
# || ||
%changelog
+* Fri Jul 26 2013 Justin M. Forbes <jforbes@redhat.com> - 3.11.0-0.rc2.git4.1
+- Linux v3.11-rc2-333-ga9b5f02
+
* Fri Jul 26 2013 Josh Boyer <jwboyer@redhat.com>
- Add patch to fix NULL deref in iwlwifi (rhbz 979581)
diff --git a/sources b/sources
index 440c48bf5..c9c90e138 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
4f25cd5bec5f8d5a7d935b3f2ccb8481 linux-3.10.tar.xz
fe39310c0f1b58e78632c3976ff80289 patch-3.11-rc2.xz
-7546798e42d744d9cc2bc17becdda5cc patch-3.11-rc2-git3.xz
+7f98a041c90deefb4ade8ee78091c422 patch-3.11-rc2-git4.xz