Linaro 4.8 fixes

Conflicts:
	drivers/net/phy/phy.c

Change-Id: I1711655670bfabfe6b2faffcd143d174fe73602b