tree 78f8ebbbc2e730b8e510e3a68b5b73755196fb68
parent fbae0f8912dc12b284433c05417ea76311205bbf
parent 81e6ca3eb74d6bdbab181dd2db378f49f76f0d97
author Russell King <rmk+kernel@arm.linux.org.uk> 1332716056 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1332716056 +0100

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