summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore3
-rw-r--r--config-generic2
-rw-r--r--kernel.spec9
-rw-r--r--sources3
4 files changed, 11 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index ce9b02aee..69f0361ce 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,5 +3,4 @@ patch-*.bz2
clog
*.rpm
kernel-2.6.*/
-/patch-2.6.37-rc6.bz2
-/patch-2.6.37-rc6-git5.bz2
+/patch-2.6.37-rc7.bz2
diff --git a/config-generic b/config-generic
index 69f8d8bda..22a6e61d2 100644
--- a/config-generic
+++ b/config-generic
@@ -3307,6 +3307,8 @@ CONFIG_USB_ZERO=m
CONFIG_USB_ANNOUNCE_NEW_DEVICES=y
+# CONFIG_USB_OTG is not set
+
#
# Sonics Silicon Backplane
#
diff --git a/kernel.spec b/kernel.spec
index 51d3f3c36..ff11a5fa1 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -82,9 +82,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 6
+%define rcrev 7
# The git snapshot level
-%define gitrev 5
+%define gitrev 0
# Set rpm version accordingly
%define rpmversion 2.6.%{upstream_sublevel}
%endif
@@ -1946,6 +1946,11 @@ fi
# || ||
%changelog
+* Tue Dec 21 2010 Kyle McMartin <kyle@redhat.com> 2.6.37.0.rc7.git0.1
+- Linux 2.6.37-rc7
+- CONFIG_USB_OTG=n (seems unnecessary?)
+- Enable release builds until .37 releases in rawhide.
+
* Sun Dec 19 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc6.git5.1
- Linux 2.6.37-rc6-git5
- sched-cure-more-NO_HZ-load-average-woes.patch: upstream.
diff --git a/sources b/sources
index 26d5eb3fc..eb9624fdc 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,2 @@
61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2
-bdc7a207c56dc6e2fc4a548c50e63289 patch-2.6.37-rc6.bz2
-e3f789b7a9c30a62b6dd7940d0ec6279 patch-2.6.37-rc6-git5.bz2
+c879f40313f5ee305a3e324ddde957be patch-2.6.37-rc7.bz2