Messages in this thread | | | Date | Fri, 9 Nov 2012 11:10:53 +0100 | Subject | Re: linux-next: manual merge of the arm-soc tree with the pinctrl tree | From | Linus Walleij <> |
| |
On Fri, Nov 9, 2012 at 3:31 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> Today's linux-next merge of the arm-soc tree got a conflict in > drivers/pinctrl/pinctrl-nomadik.c between commit 241e51ebd3b2 > ("pinctrl/nomadik: make independent of prcmu driver") from the pinctrl > tree and commit 44e47ccf8ab6 ("Merge branch 'next/multiplatform' into > for-next") from the arm-soc tree. > > I fixed it up (see below) and can carry the fix as necessary (no action > is required).
This looks like the correct fix, thanks a lot Stephen!
Yours, Linus Walleij
| |