From: Wu Jian Gang <wujiangang@espressif.com>
Date: Wed, 14 Sep 2016 06:12:39 +0000 (+0800)
Subject: Merge branch 'driver_merge_tmp/merge_soc_header' into 'master'
X-Git-Tag: v0.9~45
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4d4506954a839dcc4f96df8bf6cac0d16c4e59a8;p=esp-idf

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
---

4d4506954a839dcc4f96df8bf6cac0d16c4e59a8