Skip to content
Snippets Groups Projects
Commit 374da9da authored by Russell King's avatar Russell King
Browse files

Merge branch 'sa1111' into sa11x0 

Conflicts:
	arch/arm/common/sa1111.c
	arch/arm/mach-sa1100/neponset.c

Fixed:
	arch/arm/mach-sa1100/assabet.c
for the neponset changes
parents fbae0f89 81e6ca3e
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 459 additions and 445 deletions
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