Merge 2a26f41c30f96c9c05f3047997442394494040b4 on remote branch

Change-Id: I54ded2409a54da2f44269dc40118d5f322975d0a
tree: e4a269ede4bf0131c0e46f8599dc479b9073ae2f
  1. config/
  2. drivers/
  3. include/
  4. Makefile