tree 2096324b947761a567dd451f33664f17ee1de2cd
parent aa312be1987d43216e72ffce42bccf6bf81f62ed
parent 0af85dda39d9b673aca8c0ebae004ea70f3efc93
author Russell King <rmk+kernel@arm.linux.org.uk> 1294250943 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1294250943 +0000

Merge branch 'clksrc' into devel

Conflicts:
	arch/arm/mach-vexpress/v2m.c
	arch/arm/plat-omap/counter_32k.c
	arch/arm/plat-versatile/Makefile