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

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

Conflicts:
	arch/arm/Kconfig
	arch/arm/Makefile
parents 6d0485a9 135cad36
Hide whitespace changes
Inline Side-by-side
Supports Markdown
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