Commits
Solve the copyright conflicts when merging 'master' into hpc2. Merge branch 'master' into hpc2 Conflicts: drivers/cfi_flash.c
Solve the copyright conflicts when merging 'master' into hpc2. Merge branch 'master' into hpc2 Conflicts: drivers/cfi_flash.c