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

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:

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

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