lkml.org 
[lkml]   [2013]   [Jan]   [22]   [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 Linus' tree
On Wed, Jan 23, 2013 at 03:15:52PM +1100, Stephen Rothwell wrote:
> Hi Greg,
>
> Today's linux-next merge of the driver-core tree got a conflict in
> drivers/gpio/gpio-mvebu.c between commit 11c0ceec073c ("gpio: mvebu:
> Don't free chip label memory") from Linus' tree and commit 641d03422a59
> ("gpio: Convert to devm_ioremap_resource()") from the driver-core tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Looks good, thanks.

greg k-h


\
 
 \ /
  Last update: 2013-01-23 06:21    [W:0.026 / U:2.360 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site