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

[Greg KH]

On Mon, Feb 04, 2013 at 04:12:41PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the char-misc tree got a conflict in
> drivers/mfd/wm5102-tables.c between commit d078377faf5f ("mfd: wm5102:
> Refresh register defaults") from the mfd tree and commit 689557d3c704
> ("mfd: wm5102: Add microphone clamp control registers") from the
> char-misc tree.
> 
> I fixed it up (see below) and can carry the fix as necessary (no action
> is required).

Thanks for this, it looks fine to me.

greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/