[alsa-devel] [PATCH] ASoC: cs42l51: split i2c from codec driver

[Mark Brown]

On Tue, Apr 15, 2014 at 11:25:41PM +0000, Austin, Brian wrote:
> > On Apr 15, 2014, at 17:58, "Mark Brown" <broonie at kernel.org> wrote:

> > Applied, thanks but there was some fuzz applying - please check it came
> > out OK and that you were submitting against current code.

> Thanks, it was based off of topic/cs42l51. I'll check it now

Oh, that explains it.  Until I applied that patch there was no
topic/cs42l51 - when Linus merges a branch I delete it and then start a
new branch for any new work based off one of his -rcs (or another topic
branch if there's a dependency).  Your copy of the branch will have been
pre-merge window.  Since the merge window closed I'd deleted the old
topic branch, the fuzz will have been due to some subsystem wide patches
getting merged in.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://mailman.alsa-project.org/pipermail/alsa-devel/attachments/20140416/909eefdc/attachment.sig>