]> granicus.if.org Git - esp-idf/commit
projects / esp-idf / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fb64393 f32823f)
Merge branch 'driver_merge_tmp/merge_soc_header' into 'master'
authorWu Jian Gang <wujiangang@espressif.com>
Wed, 14 Sep 2016 06:12:39 +0000 (14:12 +0800)
committerWu Jian Gang <wujiangang@espressif.com>
Wed, 14 Sep 2016 06:12:39 +0000 (14:12 +0800)
commit4d4506954a839dcc4f96df8bf6cac0d16c4e59a8
treed3dd014186d419e9e86a1527870d2f7c46ae9a42tree | snapshot
parentfb64393f63cecb3e76314c4226966917aed61a33commit | diff
parentf32823ff6c161faf3791690e2106369222689ce4commit | diff
Merge branch 'driver_merge_tmp/merge_soc_header' into 'master'

Modify headers in idf/soc

Pass compiling under esp-idf-tests/merge_soc_tmp/merge_for_soc_headers branch.(Only changed some names of registers and INUM).

See merge request !83
Unnamed repository; edit this file 'description' to name the repository.