commit b6f5f988b6c19d5326221c4edd82d7e3a892b9ad
author Avery Pennarun <apenwarr@gmail.com> Tue Sep 23 15:16:51 2014 -0400
committer Avery Pennarun <apenwarr@gmail.com> Tue Sep 23 15:16:51 2014 -0400
tree 77f712cf781685037fb3ad815546ade4ab6a7bff
parent 58959361429d99863dc92c582a40fe0e8f9d91b9
parent 43a632cb16bc20726a8eb9cd8eda63ce94414ccf

Merge remote-tracking branch 'origin/newkernel_dev' of /ssd/athena/.repo/manifests.bak into newkernel_dev

* 'origin/newkernel_dev' of /ssd/athena/.repo/manifests.bak:
  Add newkernel_dev branch.

Conflicts:
	default.xml

default.xml

diff --git a/default.xml b/default.xml
index 50fdcc3..5053c0f 100644
--- a/default.xml
+++ b/default.xml
@@ -6,9 +6,8 @@
     review="https://gfiber-review.googlesource.com/"/>
   <default
     remote="origin"
-    revision="refs/heads/master"
+    revision="newkernel_dev"
     sync-j="3"/>
-
   <project name="toolchains/bruno"/>
   <project name="toolchains/kvm"/>
   <project name="toolchains/mindspeed"/>