tree 7ed94961b196c81fcd413e2b04d1e6945d6d227a
parent 3c00079b31f910309b30ed5c2fd2b7a2d86bba60
parent fe0cdec8bad919fd91cd344123906a55f3857209
author Russell King <rmk+kernel@arm.linux.org.uk> 1287515544 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1287515544 +0100

Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/kgene/linux-samsung into devel-stable

Conflicts:
	arch/arm/mach-at91/include/mach/system.h
	arch/arm/mach-imx/mach-cpuimx27.c

AT91 conflict resolution:
Acked-by: Anders Larsen <al@alarsen.net>
IMX conflict resolution confirmed by Uwe Kleine-König.