lkml.org 
[lkml]   [2013]   [Jan]   [23]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
SubjectRe: linux-next: manual merge of the pinctrl tree with the driver-core tree
From
On Wed, Jan 23, 2013 at 5:58 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Today's linux-next merge of the pinctrl tree got a conflict in
> drivers/pinctrl/pinctrl-nomadik.c between commit 9e0c1fb29a7c ("pinctrl:
> Convert to devm_ioremap_resource()") from the driver-core tree and commit
> 50f690d85e4e ("pinctrl/nomadik: simplify GPIO probe") from the pinctrl
> tree.
>
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Excellent, looking good.

Thanks Stephen!
Linus Walleij


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