From: Takashi Iwai <tiwai@suse.de>
Date: Thu, 13 Mar 2014 18:03:48 +0000 (+0100)
Subject: Merge tag 'asoc-v3.15-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: firefly_0821_release~176^2~4090^2~22^2~9
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c320106230c78b37c4bdbe6eafc636169e97bad9;p=firefly-linux-kernel-4.4.55.git

Merge tag 'asoc-v3.15-2' of git://git./linux/kernel/git/broonie/sound into for-next

ASoC: Updates for v3.15

This is mostly a few additional fixes from Lars-Peter, a new driver and
cleaning up a git failure with merging the Intel branch (combined with
an xargs failure to pay attention to error codes).  The history lists a
bunch of additional commits for the branch but the content of those
commits is actually present already but not recorded in history due to
git failing.  Unfortunately xargs is used in the merge script and it
doesn't do a good job of noticing errors from the commands it invokes.
---

c320106230c78b37c4bdbe6eafc636169e97bad9