Resolving merge conflicts from my remote

Author: Ashok Rao

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_MTB_STM_S2LP/PeripheralNames.h

@@ -58,6 +58,7 @@ typedef enum {
     UART_8 = (int)UART8_BASE
 } UARTName;
 
+
 #define SPI_COUNT 6
 typedef enum {
     SPI_1 = (int)SPI1_BASE,

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_MTB_STM_S2LP/PinNames.h

@@ -275,7 +275,6 @@ typedef enum {
     SPI1_SCK     = PB_10,
     SPI1_CS      = PD_1, //MX25R Chip Select
 
-// See JIRA IOTTHD-2908
     SPI2_MOSI    = PC_12,
     SPI2_MISO    = PC_11,
     SPI2_SCK     = PC_10,

targets/TARGET_STM/TARGET_STM32F4/TARGET_STM32F429xI/TARGET_MTB_STM_S2LP/system_clock.c

@@ -60,6 +60,7 @@ void SystemInit(void)
 #if (__FPU_PRESENT == 1) && (__FPU_USED == 1)
     SCB->CPACR |= ((3UL << 10 * 2) | (3UL << 11 * 2)); /* set CP10 and CP11 Full Access */
 #endif
+
     /* Reset the RCC clock configuration to the default reset state ------------*/
     /* Set HSION bit */
     RCC->CR |= (uint32_t)0x00000001;
@@ -89,7 +90,6 @@ void SystemInit(void)
 #else
     SCB->VTOR = NVIC_FLASH_VECTOR_ADDRESS; /* Vector Table Relocation in Internal FLASH */
 #endif
-
 }
 
 /**
@@ -237,4 +237,5 @@ uint8_t SetSysClock_PLL_HSI(void)
 
     return 1;
 }
-#endif /* ((CLOCK_SOURCE) & USE_PLL_HSI) */
+#endif /* ((CLOCK_SOURCE) & USE_PLL_HSI) */
+