tree f8e90adadfde630368034268de8cc5763898ab37
parent e7d863d0f42e2cf19a13c867bfcab7424388bff8
parent 7cb66dcc828662c8cacb74af08478433cef102b1
author Russell King <rmk+kernel@arm.linux.org.uk> 1332716154 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1332716154 +0100

Merge branch 'sa11x0-lcd' into sa11x0

Conflicts:
	arch/arm/mach-sa1100/assabet.c