tree 92ed1faaf112e98e29a00efc99e1a4e6c79e6a8e
parent be093beb608edf821b45fe00a8a080fb5c6ed4af
parent 569106c70e49ad67c69fa7d43a2a5218e63a4619
author Russell King <rmk@dyn-67.arm.linux.org.uk> 1237504240 +0000
committer Russell King <rmk+kernel@arm.linux.org.uk> 1237504240 +0000

Merge branch 'master' of git://git.marvell.com/orion into devel

Conflicts:

	arch/arm/mach-mx1/devices.c