Re: linux-next: manual merge of the char-misc tree with thesound-asoc tree

[Mark Brown]

On Mon, Jan 28, 2013 at 09:54:44PM +1100, Stephen Rothwell wrote:

> Today's linux-next merge of the char-misc tree got a conflict in
> include/linux/mfd/arizona/pdata.h between commit c94aa30edac4 ("ASoC:
> arizona: Allow number of channels clocked to be restricted") from the
> sound-asoc tree and commit 92a49871b378 ("extcon: arizona: Support use of
> GPIO5 as an input to jack detection") from the char-misc tree.

> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks.

Attachment: signature.asc
Description: Digital signature