SOURCES (Titanium): linux-2.6-grsecurity.patch - fixed patch merging error

[hawk]

Author: hawk                         Date: Sat May 24 12:59:04 2008 GMT
Module: SOURCES                       Tag: Titanium
---- Log message:
- fixed patch merging error

---- Files affected:
SOURCES:
   linux-2.6-grsecurity.patch (1.1.2.13 -> 1.1.2.14) 

---- Diffs:

================================================================
Index: SOURCES/linux-2.6-grsecurity.patch
diff -u SOURCES/linux-2.6-grsecurity.patch:1.1.2.13 SOURCES/linux-2.6-grsecurity.patch:1.1.2.14
--- SOURCES/linux-2.6-grsecurity.patch:1.1.2.13	Sat May 24 13:50:40 2008
+++ SOURCES/linux-2.6-grsecurity.patch	Sat May 24 14:58:57 2008
@@ -27265,6 +27265,7 @@
 +
  /* fs segment starts at (positive) offset == __per_cpu_offset[cpu] */
  #define __percpu_seg "%%fs:"
+ 
 diff -urNp linux-2.6.25.4/include/asm-x86/pgalloc_32.h linux-2.6.25.4/include/asm-x86/pgalloc_32.h
 --- linux-2.6.25.4/include/asm-x86/pgalloc_32.h	2008-05-15 11:00:12.000000000 -0400
 +++ linux-2.6.25.4/include/asm-x86/pgalloc_32.h	2008-05-18 13:33:17.000000000 -0400
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/linux-2.6-grsecurity.patch?r1=1.1.2.13&r2=1.1.2.14&f=u