Skip to content
This repository has been archived by the owner on Nov 14, 2024. It is now read-only.

Upmerge 20231010 #132

Merged
merged 1 commit into from
Jan 10, 2024
Merged

Upmerge 20231010 #132

merged 1 commit into from
Jan 10, 2024

Conversation

de-nordic
Copy link
Contributor

Upmerge fixing commits.

@de-nordic de-nordic changed the title Upmerge 201010 Upmerge 20231010 Nov 17, 2023
@de-nordic de-nordic force-pushed the upmerge-2031010 branch 2 times, most recently from a93bd91 to e8cbbda Compare November 29, 2023 12:37
@nordicjm nordicjm force-pushed the upmerge-2031010 branch 2 times, most recently from ee7ddc5 to 7e7f0b6 Compare January 8, 2024 14:03
Upstream Zephyr commit e7bd10ae719d1773f8d6b189c18f775d9dfcc93d
renamed the file from rand32.h to random.h.

Signed-off-by: Dominik Ermel <[email protected]>
@nordicjm nordicjm merged commit 5496459 into nrfconnect:main Jan 10, 2024
1 check passed
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
DNM Do not Merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants