Merge remote-tracking branch 'remotes/rocketboards/socfpga-3.15' into altera2

Conflicts:
	drivers/dma/pl330.c
	drivers/edac/Makefile
	drivers/mtd/devices/m25p80.c
drivers/dma/Kconfig: DMA_AXI_DMAC depends on DMA_ENGINE.
drivers/spi/spi-altera.c: Revert altera_spi_setup() and  altera_spi_setupxfer() functions removal.
drivers/iio/adc/ad9361.c: For Altera SoCKit platform the DAC rate should be set to 1.
arch/arm/boot/dts/socfpga_cyclone5_sockit_fmcomms2.dts: Initial commit.
Merge branch 'altera' of https://github.com/analogdevicesinc/linux into altera