Skip to content
Snippets Groups Projects
Commit 53ffe3b4 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

[ARM] Merge most of the PXA work for initial merge 

This includes PXA work up to the SPI changes for the initial merge,
since e172274c depends on the SPI
tree being merged.

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
parents f0006314 cabb352a
No related branches found
No related tags found
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 836 additions and 1638 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment