Merge remote-tracking branch 'origin/master' into HEAD
* origin/master:
Add new repo backports.
Add kernel/bruno newkernel_dev branch to a new directory.
Add hostap repo.
Conflicts:
default.xml
Change-Id: I67d9ecbaeb671582e00f267a183d3278f2ccc090
diff --git a/default.xml b/default.xml
index ef95525..068543f 100644
--- a/default.xml
+++ b/default.xml
@@ -14,6 +14,7 @@
<project name="toolchains/mindspeed"/>
<project name="toolchains/prism"/>
<project name="kernel/bruno"/>
+ <project name="kernel/bruno" path="kernel/bruno_new" revision="refs/heads/newkernel_dev"/>
<project name="kernel/prism"/>
<project name="buildroot"/>
<project name="vendor/broadcom/bmoca"/>
@@ -24,10 +25,12 @@
<project name="vendor/google/platform"/>
<project name="vendor/google/swscale"/>
<project name="vendor/google/test"/>
+ <project name="vendor/opensource/backports"/>
<project name="vendor/opensource/bluez"/>
<project name="vendor/opensource/dial"/>
<project name="vendor/opensource/ffmpeg"/>
<project name="vendor/opensource/hdhomerun_plugin"/>
+ <project name="vendor/opensource/hostap"/>
<project name="vendor/opensource/libjingle"/>
<project name="vendor/opensource/fallocate"/>
<project name="vendor/opensource/projectM"/>
