Merge commit 'gcl/merge' into next

Manual merge of:
	drivers/net/fec_mpc52xx.c