Merge remote-tracking branch 'u-boot-imx/master'

The single file conflict below is actually trivial.

Conflicts:
	board/boundary/nitrogen6x/nitrogen6x.c

diff --cc arch/arm/Kconfig
Simple merge

diff --cc board/boundary/nitrogen6x/nitrogen6x.c
index 7edfe19367521dcee2d3a56f9d953fa5790d33ed,2762fcffae11e4256ae870a74a237204d2c76df7..951b820cbba8ab6d4c82150f6224ae7e76434973
--- 1/board/boundary/nitrogen6x/nitrogen6x.c
--- 2/board/boundary/nitrogen6x/nitrogen6x.c
+++ b/board/boundary/nitrogen6x/nitrogen6x.c
@@@ -328,12 -335,7 +335,12 @@@ int board_mmc_init(bd_t *bis
  #endif
  
  #ifdef CONFIG_MXC_SPI
- iomux_v3_cfg_t const ecspi1_pads[] = {
 +int board_spi_cs_gpio(unsigned bus, unsigned cs)
 +{
 +      return (bus == 0 && cs == 0) ? (IMX_GPIO_NR(3, 19)) : -1;
 +}
 +
+ static iomux_v3_cfg_t const ecspi1_pads[] = {
        /* SS1 */
        MX6_PAD_EIM_D19__GPIO3_IO19  | MUX_PAD_CTRL(NO_PAD_CTRL),
        MX6_PAD_EIM_D17__ECSPI1_MISO | MUX_PAD_CTRL(SPI_PAD_CTRL),

diff --cc board/freescale/mx6qsabreauto/mx6qsabreauto.c
Simple merge

diff --cc board/freescale/vf610twr/vf610twr.c
Simple merge

diff --cc drivers/mtd/nand/Makefile
Simple merge

diff --cc include/configs/mx6slevk.h
Simple merge

diff --cc include/configs/nitrogen6x.h
Simple merge