d1436533bfaed5011262
parent a68fefe0d2f364ac3d8497ef37dcad713c261103
author Russell King <rmk+kernel@arm.linux.org.uk> 1281359239 +0100
committer Russell King <rmk+kernel@arm.linux.org.uk> 1281359239 +0100

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

Conflicts:
	arch/arm/Kconfig
Ûá…Âœ