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

Merge branch 'for_rmk' of git://git.mnementh.co.uk/linux-2.6-im 

Merge branch 'pxa-eseries' into pxa-machines

Conflicts:

	arch/arm/mach-pxa/Makefile
parents cc513ac0 ebcce7b1
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