Vinayak Kariappa Chettimada 079e7976fe Bluetooth: Controller: Fix erroneous merge conflict resolution ... Fix erroneous merge conflict resolution. Regression in commit f023b5f611 ("Bluetooth: controller: push topic branch to main") and commit 2e2900f1bb ("Bluetooth: controller: revert erroneous deletion"). Signed-off-by: Vinayak Kariappa Chettimada <vich@nordicsemi.no>		2021-12-22 16:53:37 +01:00
..
crypto
hal
hci	Bluetooth: Controller: Fix Extended AD data and Scan Rsp total len type	2021-12-22 16:51:35 +01:00
include	Bluetooth: controller: complete DF TX params set in conn mode	2021-12-22 12:18:17 +01:00
ll_sw	Bluetooth: Controller: Fix erroneous merge conflict resolution	2021-12-22 16:53:37 +01:00
ticker	Bluetooth: controller: Replace slave with peripheral	2021-09-21 13:01:29 +02:00
util	Bluetooth: controller: push topic branch to main	2021-11-16 21:24:37 -05:00
CMakeLists.txt	Bluetooth: controller: push topic branch to main	2021-11-16 21:24:37 -05:00
Kconfig	Bluetooth: Controller: Implement ISO Sync Receiver connection handle	2021-11-25 10:43:51 -05:00
Kconfig.df	Bluetooth: controller: complete DF TX params set in conn mode	2021-12-22 12:18:17 +01:00
Kconfig.ll_sw_split	Bluetooth: controller: Introduce preferred central conn spacing config	2021-11-22 22:23:48 -05:00