Merge branch 'master-3.3'

Merge branch 'master-3.3'

Resolved Conflicts:

	Makefile
	arch/arm/Kconfig
	arch/arm/boot/dts/zynq-ep107.dts
	arch/arm/boot/dts/zynq-zc702-xylon-snippet.dts
	arch/arm/boot/dts/zynq-zc702.dts
	arch/arm/boot/dts/zynq-zc770-xm010.dts
	arch/arm/boot/dts/zynq-zc770-xm011.dts
	arch/arm/boot/dts/zynq-zc770-xm013.dts
	arch/arm/configs/xilinx_zynq_defconfig
	arch/arm/mach-zynq/Makefile
	arch/arm/mach-zynq/board_zc702.c
	arch/arm/mach-zynq/board_zc770_xm013.c
	arch/arm/mach-zynq/timer.c
	drivers/misc/Kconfig
	drivers/misc/Makefile
	drivers/mtd/nand/nand_base.c
	drivers/net/xilinx_emacps.c