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

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

Conflicts:

	arch/arm/mach-at91/gpio.c
parents e4707dd3 148854c6
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