Merge tag 'v4.2-rc6' into asoc-topology
authorMark Brown <broonie@kernel.org>
Fri, 21 Aug 2015 22:26:37 +0000 (15:26 -0700)
committerMark Brown <broonie@kernel.org>
Fri, 21 Aug 2015 22:26:37 +0000 (15:26 -0700)
Linux 4.2-rc6

1  2 
sound/soc/soc-topology.c

Simple merge