tree caac0ea50cd26e899fccb6cdb428ccc6cced9b77
parent 46937b27427688a56bf7f5944a92d962dc43c3fa
author Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> 1242514717 +0200
committer Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> 1245708604 +0200

integrator: merge integratorap and integratorcp

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
Acked-by: Peter Pearse <peter.pearse@arm.com>