On Tue, Mar 02, 2010 at 11:43:22PM +0000, Russell King - ARM Linux wrote: > 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. I've pulled the git tree, and there is one minor problem missed due to no default support for in any of the s3c_defconfigs for cpu-freq and the s3c6400_defconfig currently fails with missing iisv4 device. I can build for-rmk/samsung6 from for-rmk/samsung5 with the fixes for the audio driver and the cpu-freq in. I'm just awaiting an OK on whether to merge the header file fix for the s3c-hsotg driver in with this. -- Ben Q: What's a light-year? A: One-third less calories than a regular year. -- To unsubscribe from this list: send the line "unsubscribe linux-samsung-soc" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html