mirror of
https://github.com/torvalds/linux
synced 2026-06-22 19:02:11 +09:00
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