tree 1a39b3de03cfc92c5b5dedfb01174d17b49df18a
parent 18bbff9f679cd470db66402fdb9c577b34324183
parent 6ed3e2acc7995625625592abe8cd3383c34a471b
author Russell King <rmk+kernel@arm.linux.org.uk> 1332716190 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1332716230 +0100

Merge branch 'sa11x0-mcp' into sa11x0

Conflicts:
	arch/arm/mach-sa1100/assabet.c
	arch/arm/mach-sa1100/collie.c
	arch/arm/mach-sa1100/generic.c
	arch/arm/mach-sa1100/lart.c
	arch/arm/mach-sa1100/shannon.c