summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Robinson <pbrobinson@gmail.com>2013-01-07 21:37:44 +0000
committerPeter Robinson <pbrobinson@gmail.com>2013-01-07 21:37:44 +0000
commit21c1d87aab9bb786dc20c46f46a50368b99431aa (patch)
tree63c45a899e454d57729db4bab4fb1533828365cb
parentf009369387e956b2ca707c7765bde9ff78897396 (diff)
parent41659d64214840a7479b5809a669f85b8794ee14 (diff)
downloadkernel-21c1d87aab9bb786dc20c46f46a50368b99431aa.tar.gz
kernel-21c1d87aab9bb786dc20c46f46a50368b99431aa.tar.xz
kernel-21c1d87aab9bb786dc20c46f46a50368b99431aa.zip
Merge branch 'master' of ssh://pkgs.fedoraproject.org/kernel
-rw-r--r--kernel.spec8
-rw-r--r--sources2
2 files changed, 8 insertions, 2 deletions
diff --git a/kernel.spec b/kernel.spec
index a4507fbc0..8778a87ce 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 1
+%define gitrev 2
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2299,6 +2299,12 @@ fi
# ||----w |
# || ||
%changelog
+* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git2.1
+- Linux v3.8-rc2-191-gd287b87
+
+* Mon Jan 07 2013 Justin M. Forbes <jforbes@redhat.com> - 3.8.0-0.rc2.git1.2
+- Reenable debugging options.
+
* Mon Jan 7 2013 Peter Robinson <pbrobinson@fedoraproject.org>
- Further ARM config updates
- Add patch to fix building omapdrm
diff --git a/sources b/sources
index 7b1c33c77..534c4de02 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
21223369d682bcf44bcdfe1521095983 linux-3.7.tar.xz
bf527ba474ebb9a8a0cd2432ac0ac2b8 patch-3.8-rc2.xz
-3ae68b09402b6b775b5174508138b0b7 patch-3.8-rc2-git1.xz
+965db3f362179ac3bf161abaed7ac308 patch-3.8-rc2-git2.xz