tree 96d4b03713537e6c0a696e4770c23f9d39792666
parent f0082d329a94551cca33e2860e1078c072447805
parent afa0dd08a65ec196b37d386639ded58ecc1bddcd
author roy zang <tie-fei.zang@freescale.com> 1167880205 +0800
committer Zang Tiefei <roy@bus.ap.freescale.net> 1167880205 +0800

Merge branch 'master' into hpc2