Messages in this thread | | | Date | Wed, 4 Jan 2012 14:52:46 -0800 | From | Greg KH <> | Subject | Re: linux-next: manual merge of the driver-core tree with the s5p tree |
| |
On Wed, Dec 28, 2011 at 04:05:59PM +1100, Stephen Rothwell wrote: > Hi Greg, > > Today's linux-next merge of the driver-core tree got a conflict in > arch/arm/mach-s3c2440/clock.c between commit 0cfb26e1fb9d ("ARM: SAMSUNG: > register uart clocks to clock lookup list") from the s5p tree and commit > 4a858cfc9af8 ("arm: convert sysdev_class to a regular subsystem") from > the driver-core tree. > > Just context changes. I fixed it up (see below) and can carry the fix as > necessary.
Looks fine, thanks.
greg k-h
| |