This includes PXA work up to the SPI changes for the initial merge, since e172274ccc depends on the SPI tree being merged. Conflicts: arch/arm/configs/em_x270_defconfig arch/arm/configs/xm_x270_defconfig
e172274ccc