summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Soller <jeremy@system76.com>2021-05-04 08:15:05 -0600
committerJeremy Soller <jeremy@system76.com>2021-05-04 08:15:05 -0600
commit76f2f12f2c50e9d569df7ab519e88e770675e7d5 (patch)
tree1d9645cf8e81e403251c50413d630ce01ee03740
parentdc65a3a3f74778d65912d932725a19d5720ccaae (diff)
Update kernel
-rw-r--r--.gitmodules2
m---------kernel0
2 files changed, 1 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 0ddadc4..ae065b5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -21,7 +21,7 @@
[submodule "kernel"]
path = kernel
url = https://gitlab.redox-os.org/redox-os/kernel.git
- branch = aarch64-rebase
+ branch = master
[submodule "rust"]
path = rust
url = https://gitlab.redox-os.org/redox-os/rust.git
diff --git a/kernel b/kernel
-Subproject ad39568fe903c64229938f82bbc48d9919ba5e6
+Subproject ac8c7834efe7cf66669cd42010d5ce62d4e8c36