* In the VM tests, apply a patch to increase the 15s timeout on CIFS

operations to 120s.  This is necessary if the host is heavily
  loaded.  For instance, in the Hydra build farm, if there are many
  concurrent jobs, VM builds often fail because they hit the timeout.

svn path=/nixpkgs/trunk/; revision=22347

pkgs/os-specific/linux/kernel/patches.nix

@@ -155,4 +155,11 @@ in
       features.aufsBase = true;
     };
 
+  # Increase the timeout on CIFS requests from 15 to 120 seconds to
+  # make CIFS more resilient to high load on the CIFS server.
+  cifs_timeout =
+    { name = "cifs-timeout";
+      patch = ./cifs-timeout.patch;
+    };
+  
 }