summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2013-05-06 08:12:58 -0400
committerJosh Boyer <jwboyer@redhat.com>2013-05-06 08:15:04 -0400
commit93563b74192ef7c861a7d6ae08b4189eb063c911 (patch)
tree607a3729c523c22adcc05f35476937e8028040b8
parentc850cbb9fdfb4128df54ad925784823d22bf13ec (diff)
downloadkernel-93563b74192ef7c861a7d6ae08b4189eb063c911.tar.gz
kernel-93563b74192ef7c861a7d6ae08b4189eb063c911.tar.xz
kernel-93563b74192ef7c861a7d6ae08b4189eb063c911.zip
Linux v3.9-10104-g1aaf6d3
-rw-r--r--config-generic2
-rw-r--r--kernel.spec9
-rw-r--r--sources2
3 files changed, 9 insertions, 4 deletions
diff --git a/config-generic b/config-generic
index a06775f46..9ed6c1e5d 100644
--- a/config-generic
+++ b/config-generic
@@ -4747,6 +4747,8 @@ CONFIG_IOMMU_SUPPORT=y
# CONFIG_MAILBOX is not set
+# CONFIG_RESET_CONTROLLER is not set
+
# CONFIG_HSI is not set
# CONFIG_PM_DEVFREQ is not set
diff --git a/kernel.spec b/kernel.spec
index c6d801953..195243477 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 16
+%define gitrev 17
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -707,7 +707,7 @@ Patch21003: 20-21-MFD-ab8500-export-ab8500_gpadc_sw_hw_convert-properly.patch
# ARM tegra
Patch21005: arm-tegra-usb-no-reset-linux33.patch
-Patch21006: arm-tegra-fixclk.patch
+#atch21006: arm-tegra-fixclk.patch
Patch21007: arm-tegra-sdhci-module-fix.patch
#rhbz 754518
@@ -1294,7 +1294,7 @@ ApplyPatch arm-export-read_current_timer.patch
ApplyPatch arm-of-dma.patch
ApplyPatch arm-lpae-ax88796.patch
ApplyPatch arm-tegra-usb-no-reset-linux33.patch
-ApplyPatch arm-tegra-fixclk.patch
+#pplyPatch arm-tegra-fixclk.patch
ApplyPatch arm-tegra-sdhci-module-fix.patch
ApplyPatch 20-21-MFD-ab8500-export-ab8500_gpadc_sw_hw_convert-properly.patch
@@ -2253,6 +2253,9 @@ fi
# ||----w |
# || ||
%changelog
+* Mon May 06 2013 Josh Boyer <jwboyer@redhat.com> - 3.10.0-0.rc0.git17.1
+- Linux v3.9-10104-g1aaf6d3
+
* Sun May 5 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Update ARM config
diff --git a/sources b/sources
index 8d3a85a11..91cdd5568 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
4348c9b6b2eb3144d601e87c19d5d909 linux-3.9.tar.xz
-c4f5c1487011241d726f197a17f4c09e patch-3.9-git16.xz
+4de7595812ce4f292cf62a41b606e294 patch-3.9-git17.xz