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

Merge branch 'sa11x0-lcd' into sa11x0 

Conflicts:
	arch/arm/mach-sa1100/assabet.c
parents e7d863d0 7cb66dcc
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