Merge commit 'f128e2ef41bc11fcc57d2f3f8e2a3cae90410b79' into petalinux/master-next

Upgrade petalinux/master-next branch to state before
v3.9 merge to OSL master-next.
There were just small 3 conflicts in which were
resolved by using version from the OSL repo.
	arch/arm/mach-zynq/xaxipcie.c
	drivers/net/ethernet/xilinx/xilinx_emacps.c
	drivers/watchdog/of_xilinx_wdt.c

Signed-off-by: Michal Simek <michal.simek@xilinx.com>