From 667735efe0b2ea4f6ac87f46ca25a46eacf54548 Mon Sep 17 00:00:00 2001
From: aszlig <aszlig@redmoonstudios.org>
Date: Sat, 11 Apr 2015 00:41:29 +0200
Subject: mainlineKernel: Update to latest upstream master.

Fast-forward for 23 commits, which include fixes for sound, pci,
pm-sleep and nios2.

Signed-off-by: aszlig <aszlig@redmoonstudios.org>
---
 modules/user/aszlig/system/kernel.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules')

diff --git a/modules/user/aszlig/system/kernel.nix b/modules/user/aszlig/system/kernel.nix
index 12f54b8d..a48dcd40 100644
--- a/modules/user/aszlig/system/kernel.nix
+++ b/modules/user/aszlig/system/kernel.nix
@@ -21,8 +21,8 @@ let
     version = "4.0.0-rc7";
     src = pkgs.fetchgit {
       url = git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git;
-      rev = "20624d17963c737bbd9f242402bf3136cb664d10";
-      sha256 = "1x6gxs015bn3nwgrwb5y1cxnnijrwksfbs3g7sr12bj8dljs8l5d";
+      rev = "cfc4957b46d78115351ad6ff3ce0cd0da7b83730";
+      sha256 = "046scwhr4j3z1mvzbicf426qc61654lf3xc7l6kxzqrrpnnrlcrg";
     };
   };
 
-- 
cgit 1.4.1