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

Conflicts:
	drivers/dma/pl330.c
	drivers/edac/Makefile
	drivers/mtd/devices/m25p80.c