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

Merge branch 'for-rmk' of git://git.pengutronix.de/git/imx/linux-2.6 

Conflicts:
	arch/arm/mach-mx3/mach-pcm037.c
parents d4d9959c b3aa111f
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