Merge tag 'asoc-v3.18-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2014 11:52:29 +0000 (12:52 +0100)
committerTakashi Iwai <tiwai@suse.de>
Mon, 27 Oct 2014 11:52:29 +0000 (12:52 +0100)
commitd5432503bfb49f3425bad0b850714ffd8b533cfc
tree97926e7eea0b6d8b0e8bf98748dd9c0ef4c718ad
parent6a98e34b58919c52e8c8beec991759999af342da
parentc0d018bd5b1aabad59dffdec568e189359d93a14
Merge tag 'asoc-v3.18-rc2' of git://git./linux/kernel/git/broonie/sound into for-linus

ASoC: Fixes for v3.18

A few small driver fixes for v3.18 plus the removal of the s6000 support
since the relevant chip is no longer supported in mainline.