742eaa6a6e
Conflicts: arch/arm/common/gic.c arch/arm/plat-omap/include/plat/common.h
Conflicts: arch/arm/common/gic.c arch/arm/plat-omap/include/plat/common.h