From a4d973fee2bd146954068016ba8cc70349a025ae Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Thu, 3 Nov 2016 17:18:03 -0600
Subject: [PATCH] Update libc and ralloc, remove ralloc from repo as it is
 fetched with cargo

---
 .gitmodules                         | 3 ---
 libstd                              | 2 +-
 libstd_real/alloc_system/Cargo.toml | 2 +-
 programs/pkgutils                   | 2 +-
 programs/userutils                  | 2 +-
 ralloc                              | 1 -
 6 files changed, 4 insertions(+), 8 deletions(-)
 delete mode 160000 ralloc

diff --git a/.gitmodules b/.gitmodules
index 4fcfda4dc..566a23b4b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "libstd"]
 	path = libstd
 	url = https://github.com/redox-os/libstd.git
-[submodule "ralloc"]
-	path = ralloc
-	url = https://github.com/redox-os/ralloc
 [submodule "ion"]
 	path = programs/ion
 	url = https://github.com/redox-os/ion.git
diff --git a/libstd b/libstd
index 2f7ee270c..e29b0cbfc 160000
--- a/libstd
+++ b/libstd
@@ -1 +1 @@
-Subproject commit 2f7ee270c63151c6f3242ad4f1b669a76ed48a5c
+Subproject commit e29b0cbfc85f6dc644428d053539800c173f70f0
diff --git a/libstd_real/alloc_system/Cargo.toml b/libstd_real/alloc_system/Cargo.toml
index 8cdca8a32..2b00dcbf7 100644
--- a/libstd_real/alloc_system/Cargo.toml
+++ b/libstd_real/alloc_system/Cargo.toml
@@ -9,4 +9,4 @@ default-features = false
 features = ["allocator"]
 
 [replace]
-"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "new_kernel" }
+"libc:0.2.17" = { git = "https://github.com/redox-os/liblibc.git", branch = "redox" }
diff --git a/programs/pkgutils b/programs/pkgutils
index 18e791694..62d860f9a 160000
--- a/programs/pkgutils
+++ b/programs/pkgutils
@@ -1 +1 @@
-Subproject commit 18e7916946b6dbe75236023e24c40793fd99705d
+Subproject commit 62d860f9a226c0be54bf4969ed1afae42f445f19
diff --git a/programs/userutils b/programs/userutils
index d765b381f..98d7b64a1 160000
--- a/programs/userutils
+++ b/programs/userutils
@@ -1 +1 @@
-Subproject commit d765b381f83b59c57b52b6981c3ea946ebd891f7
+Subproject commit 98d7b64a16c9c5e617c5e206945a9f380788111b
diff --git a/ralloc b/ralloc
deleted file mode 160000
index be2a916a2..000000000
--- a/ralloc
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit be2a916a257344ed09345177f01b8fb367542185