tree 877b7d8efe1e4e4ce48416186b4f45da3a5fccac
parent 1db3706b05b11abcf2673ffbed5ad43b4c90ed11
parent 4fb0d2ea397ab207fdecbd88ad0e37b36ce68a62
author Russell King <rmk+kernel@arm.linux.org.uk> 1316205916 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1316205916 +0100

Merge branch 'for-rmk' of git://linux-arm.org/linux-2.6-wd into devel-stable

Conflicts:
	arch/arm/mach-imx/mach-cpuimx27.c