Tian Hao f87ebb6d49 Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid ... # Conflicts: # components/bt/bluedroid/stack/btu/btu_task.c		2016-10-16 17:08:05 +08:00
..
bta	1. Recover "future_t" model implementation using semaphore to allow for blocking function	2016-10-10 21:34:21 +08:00
btcore	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
btif	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
device	1. Recover "future_t" model implementation using semaphore to allow for blocking function	2016-10-10 21:34:21 +08:00
gki	component/bt: add bluedroid 1st version	2016-09-26 21:37:39 +08:00
hci	1. Recover "future_t" model implementation using semaphore to allow for blocking function	2016-10-10 21:34:21 +08:00
include	component/bt : modify some files adapt to new master	2016-10-07 10:47:25 +08:00
main	component/bt : adjust the bluedroid architecture	2016-09-27 21:38:07 +08:00
osi	1. Recover "future_t" model implementation using semaphore to allow for blocking function	2016-10-10 21:34:21 +08:00
profiles	component/bt : add bluf that use bluetooth config wifi connection demos	2016-10-07 11:16:13 +08:00
stack	Merge branch 'feature/btdm_blufi' into feature/btdm_bluedroid	2016-10-16 17:08:05 +08:00