summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony G. Basile <blueness@gentoo.org>2012-01-04 14:43:19 -0500
committerAnthony G. Basile <blueness@gentoo.org>2012-01-04 14:43:19 -0500
commit2a68f01af2b25bb99ab786d19af10a4d36a770a6 (patch)
tree36afba49a5f93043d508d606a22faf1de134cb78
parentGrsec/PaX: 2.2.2-2.6.32.52-201201031758 + 2.2.2-3.1.7-201201032037.patch (diff)
downloadhardened-patchset-2a68f01af2b25bb99ab786d19af10a4d36a770a6.tar.gz
hardened-patchset-2a68f01af2b25bb99ab786d19af10a4d36a770a6.tar.bz2
hardened-patchset-2a68f01af2b25bb99ab786d19af10a4d36a770a6.zip
Added Removed EXTRAVERSION = hunk
-rw-r--r--3.1.7/1006_linux-3.1.7.patch12
1 files changed, 12 insertions, 0 deletions
diff --git a/3.1.7/1006_linux-3.1.7.patch b/3.1.7/1006_linux-3.1.7.patch
index 78c12cd..c4804fe 100644
--- a/3.1.7/1006_linux-3.1.7.patch
+++ b/3.1.7/1006_linux-3.1.7.patch
@@ -1,3 +1,15 @@
+diff --git a/Makefile b/Makefile
+index 2d6e0a8..96c48df 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,6 +1,6 @@
+ VERSION = 3
+ PATCHLEVEL = 1
+-SUBLEVEL = 6
++SUBLEVEL = 7
+ EXTRAVERSION =
+ NAME = "Divemaster Edition"
+
diff --git a/kernel/time/clockevents.c b/kernel/time/clockevents.c
index 13dfaab..e4c699d 100644
--- a/kernel/time/clockevents.c