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 s5p tree
On Wed, Dec 28, 2011 at 04:00:45PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> arch/arm/mach-exynos/cpu.c between commit f983575aa90c ("ARM: EXYNOS:
> Enable conversion of GIC dt irq specifier to linux virq") 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


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