Merge branch 'karo-tx6-mainline' into stable

author Lothar Waßmann <LW@KARO-electronics.de>

Tue, 5 Jul 2016 14:05:22 +0000 (16:05 +0200)

committer Lothar Waßmann <LW@KARO-electronics.de>

Tue, 5 Jul 2016 14:05:22 +0000 (16:05 +0200)
author Lothar Waßmann <LW@KARO-electronics.de>
Tue, 5 Jul 2016 14:05:22 +0000 (16:05 +0200)
committer Lothar Waßmann <LW@KARO-electronics.de>
Tue, 5 Jul 2016 14:05:22 +0000 (16:05 +0200)
diff --cc drivers/net/ethernet/freescale/fec_main.c
Simple merge
diff --cc drivers/spi/spi-omap2-mcspi.c
Simple merge
author	Lothar Waßmann <LW@KARO-electronics.de>
	Tue, 5 Jul 2016 14:05:22 +0000 (16:05 +0200)
committer	Lothar Waßmann <LW@KARO-electronics.de>
	Tue, 5 Jul 2016 14:05:22 +0000 (16:05 +0200)
		1	2
drivers/net/ethernet/freescale/fec_main.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/spi/spi-omap2-mcspi.c	patch \|	diff1 \|	diff2 \|	blob \| history