On Thu, Feb 25, 2010 at 12:09:19AM +0000, Ben Dooks wrote: > git://git.fluff.org/bjdooks/linux.git for-rmk/samsung5 Conflicts in arch/arm/Kconfig and arch/arm/Makefile - please check the resulting merge carefully. Unfortunately, no patch available since devel-stable has multiple ancestors.