Merge "GIC-600: Fix include ordering according to the coding style" into integration

drivers/arm/gic/v3/gic600_multichip.c

@@ -9,13 +9,13 @@
  */
 
 #include <assert.h>
-#include <common/debug.h>
 
-#include <drivers/arm/gicv3.h>
+#include <common/debug.h>
 #include <drivers/arm/gic600_multichip.h>
+#include <drivers/arm/gicv3.h>
 
-#include "gic600_multichip_private.h"
 #include "../common/gic_common_private.h"
+#include "gic600_multichip_private.h"
 
 #warning "GIC-600 Multichip driver is currently experimental and the API may change in future."
 

plat/arm/board/n1sdp/n1sdp_bl31_setup.c

@@ -6,11 +6,11 @@
 
 #include <platform_def.h>
 
+#include <common/debug.h>
 #include <drivers/arm/css/css_mhu_doorbell.h>
 #include <drivers/arm/css/scmi.h>
 #include <drivers/arm/css/sds.h>
 #include <drivers/arm/gic600_multichip.h>
-#include <common/debug.h>
 #include <lib/mmio.h>
 #include <lib/utils.h>
 #include <plat/arm/common/plat_arm.h>