[ARM] Merge most of the PXA work for initial merge (53ffe3b4) · Commits · BeagleBoard.org / Linux

Commit 53ffe3b4 authored 16 years ago by

Russell King Committed by Russell King 16 years ago

[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

Branches

Admin message

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