From: Sapan Bhatia <sapanb@cs.princeton.edu>
Date: Thu, 12 Feb 2009 18:20:51 +0000 (+0000)
Subject: Apply new patches
X-Git-Url: http://git.onelab.eu/?p=linux-2.6.git;a=commitdiff_plain;h=fb4ee65cec52be8d41f963cf91612bb238c418c1

Apply new patches
---

diff --git a/kernel-2.6.spec b/kernel-2.6.spec
index 8bbae48b5..94a3c3449 100644
--- a/kernel-2.6.spec
+++ b/kernel-2.6.spec
@@ -186,6 +186,8 @@ Patch670: linux-2.6-670-gcc43.patch
 %endif
 Patch680: linux-2.6-680-htb-hysteresis-tso.patch
 Patch690: linux-2.6-690-web100.patch
+Patch700: linux-2.6-700-click-for-trellis.patch
+Patch710: linux-2.6-710-disable-vserver-check-for-ns-devices.patch
 
 # See also the file named 'sources' here for the related checksums
 # NOTE. iwlwifi should be in-kernel starting from 2.6.24
@@ -392,6 +394,10 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 680
 %ApplyPatch 690
 
+# Trellis series
+%ApplyPatch 700
+%ApplyPatch 710
+
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.