From mboxrd@z Thu Jan  1 00:00:00 1970
From: ben-linux@fluff.org (Ben Dooks)
Date: Thu, 4 Mar 2010 23:16:29 +0000
Subject: [PULL] Pull request for for-rmk/samsung5
In-Reply-To: <20100302234322.GB29715@n2100.arm.linux.org.uk>
References: <20100225000919.GA28433@fluff.org.uk>
	<20100302234322.GB29715@n2100.arm.linux.org.uk>
Message-ID: <20100304231629.GC24864@trinity.fluff.org>
To: linux-arm-kernel@lists.infradead.org
List-Id: linux-arm-kernel.lists.infradead.org

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.