summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-17 22:57:30 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-17 22:57:30 -0400
commit69fc02b694d6e1229060a0c60c47b88e6731289a (patch)
tree25e31fe0884fc115834cd86b3ab26ab602a87804
parent93e7772b8b96008038a19a002cc48d31c6f6c7b7 (diff)
downloadkernel-69fc02b694d6e1229060a0c60c47b88e6731289a.tar.gz
kernel-69fc02b694d6e1229060a0c60c47b88e6731289a.tar.xz
kernel-69fc02b694d6e1229060a0c60c47b88e6731289a.zip
3.1-rc2-git4 snapshot
-rw-r--r--config-ia64-generic1
-rw-r--r--kernel.spec3
-rw-r--r--sources1
3 files changed, 4 insertions, 1 deletions
diff --git a/config-ia64-generic b/config-ia64-generic
index ca97689fa..52900a8e7 100644
--- a/config-ia64-generic
+++ b/config-ia64-generic
@@ -13,6 +13,7 @@ CONFIG_EFI=y
# CONFIG_ITANIUM is not set
CONFIG_MCKINLEY=y
CONFIG_IA64_GENERIC=y
+CONFIG_DMAR=y
# CONFIG_IA64_DIG is not set
# CONFIG_IA64_HP_ZX1 is not set
# CONFIG_IA64_SGI_SN2 is not set
diff --git a/kernel.spec b/kernel.spec
index e59827969..6c98888c0 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -84,7 +84,7 @@ Summary: The Linux kernel
# The rc snapshot level
%define rcrev 2
# The git snapshot level
-%define gitrev 0
+%define gitrev 4
# Set rpm version accordingly
%define rpmversion 3.%{upstream_sublevel}.0
%endif
@@ -2060,6 +2060,7 @@ fi
# || ||
%changelog
* Wed Aug 17 2011 Josh Boyer <jwboyer@redhat.com>
+- Linux 3.1-rc2-git4
- Create the kernel-tools subpackages based on a start by davej
* Tue Aug 16 2011 Dave Jones <davej@redhat.com>
diff --git a/sources b/sources
index e9feef65c..07ee67e0b 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
398e95866794def22b12dfbc15ce89c0 linux-3.0.tar.bz2
f358c354ab6d3b0da1265b504f85ec50 patch-3.1-rc2.bz2
+65afd667c215f3a9470c7b0f5d7b7b9a patch-3.1-rc2-git4.bz2