Merge remote-tracking branch 'upstream/master' into staging

2015-05-07 01:44:49 -07:00
parent d3f3317632 10bb715c07
commit 074c4a7f78
1696 changed files with 4288 additions and 39821 deletions
@@ -11,7 +11,7 @@ rec {
  });

  busyboxMinimal = busybox.override {
-    useUclibc = true;
+    useMusl = true;
    enableStatic = true;
    enableMinimal = true;
    extraConfig = ''