Skip to content
Commit 044e5f45 authored by Russell King's avatar Russell King Committed by Russell King
Browse files

Merge branch 'pxa' into devel 

Conflicts:

	arch/arm/configs/em_x270_defconfig
	arch/arm/configs/xm_x270_defconfig
parents f0006314 faf64ed4
Hide whitespace changes
Inline Side-by-side
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