Skip to content

Commit 2ea6cde

Browse files
committed
west: update zephyr to 5ebb04fb5
This pulls in Intel Mic Privacy driver Signed-off-by: Adrian Bonislawski <adrian.bonislawski@intel.com>
1 parent 33fa4ae commit 2ea6cde

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

west.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,11 @@ manifest:
4343

4444
- name: zephyr
4545
repo-path: zephyr
46+
<<<<<<< HEAD
4647
revision: aaa119d75729410ae70fc8ba188634c23214f804
48+
=======
49+
revision: 5ebb04fb561101a231de5567d85df1ff02bd58cf
50+
>>>>>>> west: update zephyr to 5ebb04fb5
4751
remote: zephyrproject
4852

4953
# Import some projects listed in zephyr/west.yml@revision

0 commit comments

Comments
 (0)