Skip to content
Commit 4722cd77 authored by Russell King's avatar Russell King
Browse files

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable 

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c
parents 1db3706b 4fb0d2ea
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment