Merge 6ae2412f41497e5007bac465bfaafa241c056ea5 on remote branch

Change-Id: I5e1254973e2307abcccaa8447fa2d6ce7d208e2f
tree: 7190360e00fa75cf08c7c5145a39868e94b15108
  1. config/
  2. drivers/
  3. include/
  4. Makefile