about summary refs log tree commit diff
path: root/modules/user
diff options
context:
space:
mode:
authoraszlig <aszlig@redmoonstudios.org>2015-04-09 02:17:20 +0200
committeraszlig <aszlig@redmoonstudios.org>2015-04-09 02:17:20 +0200
commit096d5d1fd5b2e92ce5ed01de9fe7c83397274679 (patch)
tree6cf8cdd86a5c40f4e161175386b51c6dfbeef17a /modules/user
parentaf8e8c90482560fa96ff5096969306dbf037aaeb (diff)
mainlineKernel: Update to version 4.0.0-rc7.
Plus 30 commits more (akpm, drm-fixes, media-fixes).

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
Diffstat (limited to 'modules/user')
-rw-r--r--modules/user/aszlig/system/kernel.nix6
1 files changed, 3 insertions, 3 deletions
diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index 02e99282..12f54b8d 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -18,11 +18,11 @@ let
   in pkgs.writeText "generated.kconf" (mkConf exprs + "\n");
 
   mainlineKernel = {
-    version = "4.0.0-rc6";
+    version = "4.0.0-rc7";
     src = pkgs.fetchgit {
       url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;
-      rev = "6c310bc1acdd02110182a2ec6efa3e7571a3b80c";
-      sha256 = "1k28sqq8d8s3jicnskdwc180rag96am4xk9lbifajqv50adyjvnp";
+      rev = "20624d17963c737bbd9f242402bf3136cb664d10";
+      sha256 = "1x6gxs015bn3nwgrwb5y1cxnnijrwksfbs3g7sr12bj8dljs8l5d";
     };
   };