lkml.org 
[lkml]   [2012]   [Jan]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: linux-next: manual merge of the driver-core tree with the arm tree
On Wed, Dec 28, 2011 at 04:40:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/plat-samsung/include/plat/cpu.h between commit b024043b6d0d
> ("ARM: 7245/1: S3C64XX: introduce arch/arm/mach-s3c64xx/common.[ch]")
> from the arm tree and commit 4a858cfc9af8 ("arm: convert sysdev_class to
> a regular subsystem") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary.

Looks good, thanks.

greg k-h


\
 
 \ /
  Last update: 2012-01-05 00:13    [W:0.030 / U:0.204 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site