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
�d���